[Xfce4-commits] <thunarx-python:master> Added dummy files

[Adam Plumb]

Updating branch refs/heads/master
         to 373272fc239d36e6aec828740f51758277846c3b (commit)
       from 870d34f70ff1a22d061b7c4476df2f0ad76d6e6d (commit)

commit 373272fc239d36e6aec828740f51758277846c3b
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Thu Sep 17 21:26:19 2009 -0400

    Added dummy files

 README => AUTHORS   |    0
 README => ChangeLog |    0
 README => NEWS      |    0
 configure.ac        |   21 ++++++++++++---------
 src/Makefile.am     |   26 ++++++++++++++------------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/README b/AUTHORS
similarity index 100%
copy from README
copy to AUTHORS
diff --git a/README b/ChangeLog
similarity index 100%
copy from README
copy to ChangeLog
diff --git a/README b/NEWS
similarity index 100%
copy from README
copy to NEWS
diff --git a/configure.ac b/configure.ac
index c6e5859..7a47d00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,19 +9,19 @@ AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_LIBTOOL
 
 # Check for programs
 PKG_CHECK_MODULES([THUNARX], [thunarx-1 >= 0.4.0])
-PKG_CHECK_PACKAGE([GTK], [gtk+-2.0 >= 2.6.0])
-PKG_CHECK_PACKAGE([GLIB], [glib-2.0 >= 2.6.0])
-PKG_CHECK_PACKAGE([GOBJECT], [gobject-2.0 >= 2.6.0])
-PKG_CHECK_PACKAGE([PYTHON], [python >= 2.4.0])
-PKG_CHECK_PACKAGE([PYGTK], [pygtk-2.0 >= 2.8.0])
+PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.6.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.6.0])
+PKG_CHECK_MODULES([PYGTK], [pygtk-2.0 >= 2.8.0])
 
-PACKAGE_CFLAGS="-g -Wall $THUNARX_CFLAGS $APR_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GOBJECT_CFLAGS $PYTHON_CFLAGS"
-PACKAGE_LIBS="-g $THUNARX_LIBS $APR_LIBS $GTK_LIBS $GLIB_LIBS $GOBJECT_LIBS $PYTHON_LIBS"
-PACKAGE_LDFLAGS="$THUNARX_LDFLAGS $APR_LDFLAGS $GTK_LDFLAGS $GLIB_LDFLAGS $GOBJECT_LDFLAGS $PYTHON_LDFLAGS"
-PACKAGE_CPPFLAGS="$THUNARX_CPPFLAGS $APR_CPPFLAGS $GTK_CPPFLAGS $GLIB_CPPFLAGS $GOBJECT_CPPFLAGS $PYTHON_CPPFLAGS"
+PACKAGE_CFLAGS="-g -Wall $THUNARX_CFLAGS $APR_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GOBJECT_CFLAGS"
+PACKAGE_LIBS="-g $THUNARX_LIBS $APR_LIBS $GTK_LIBS $GLIB_LIBS $GOBJECT_LIBS"
+PACKAGE_LDFLAGS="$THUNARX_LDFLAGS $APR_LDFLAGS $GTK_LDFLAGS $GLIB_LDFLAGS $GOBJECT_LDFLAGS"
+PACKAGE_CPPFLAGS="$THUNARX_CPPFLAGS $APR_CPPFLAGS $GTK_CPPFLAGS $GLIB_CPPFLAGS $GOBJECT_CPPFLAGS"
 
 # Make dependency CFLAGS and LIBS available
 AC_SUBST(PACKAGE_CFLAGS)
@@ -29,6 +29,9 @@ AC_SUBST(PACKAGE_LIBS)
 AC_SUBST(PACKAGE_LDFLAGS)
 AC_SUBST(PACKAGE_CPPFLAGS)
 
+PYTHON_CFLAGS="-I/usr/include/boost/python `python-config --includes`"
+PYTHON_LIBS="`python-config --ldflags`"
+
 AC_MSG_CHECKING(for pygtk defs)
 PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFSDIR)
diff --git a/src/Makefile.am b/src/Makefile.am
index b693e13..604e2f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,32 +1,34 @@
 thunar_extensiondir=$(libdir)/thunarx-1
 
-thunar_extension_LTLIBRARIES = thunarx-python.la
+thunar_extension_LTLIBRARIES = libthunarx-python.la
 
-thunarx_python_la_SOURCES = \
+libthunarx_python_la_SOURCES = \
     thunarx_python-object.c                 \
     thunarx_python-object.h                 \
     thunarx_python.c                        \
     thunarx_python.h
 
-thunarx_python_la_LIBADD = \
-    $(PACKAGE_LIBS)
+libthunarx_python_la_LIBADD = \
+    $(PACKAGE_LIBS)         \
+    $(PYTHON_LIBS)
  
-thunarx_python_la_LDFLAGS = \
+libthunarx_python_la_LDFLAGS = \
     -module -pthread
     $(PACKAGE_LDFLAGS)
  
-thunarx_python_la_CPPFLAGS = \
+libthunarx_python_la_CPPFLAGS = \
     $(PACKAGE_CPPFLAGS)
  
-thunarx_python_la_CFLAGS = \
-    $(PACKAGE_CFLAGS)
+libthunarx_python_la_CFLAGS = \
+    $(PACKAGE_CFLAGS)           \
+    $(PYTHON_CFLAGS)
  
-pyexec_LTLIBRARIES = thunarx.la
+pyexec_LTLIBRARIES = libthunarx.la
 pyexecdir = $(libdir)/thunarx-1/thunarx-python
 
-thunarx_la_LIBADD = $(PACKAGE_LIBS)
-thunarx_la_SOURCES = thunarxmodule.c
-nodist_thunarx_la_SOURCES = thunarx.c
+libthunarx_la_LIBADD = $(PACKAGE_LIBS)
+libthunarx_la_SOURCES = thunarxmodule.c
+nodist_libthunarx_la_SOURCES = thunarx.c
 thunarx.c: thunarx.defs thunarx.override
 CLEANFILES = thunarx.c
 EXTRA_DIST = thunarx.override thunarx.defs