[Xfce4-commits] <thunarx-python:master> Cleaned up some more autotools stuff

[Adam Plumb]

Updating branch refs/heads/master
         to d7c6f3105ef71a14d1e52ab55a234a769dec11dc (commit)
       from 35bb97395d99cb0a1de46eca72ad44cfafb15a5a (commit)

commit d7c6f3105ef71a14d1e52ab55a234a769dec11dc
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Fri Dec 11 15:44:10 2009 -0500

    Cleaned up some more autotools stuff

 configure.ac.in |    4 +++-
 src/Makefile.am |   13 +++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index dd62fee..7a1fa52 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -72,10 +72,12 @@ XDT_CHECK_PACKAGE([PYGTK], [pygtk-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GNOMEPYTHON], [gnome-python-2.0], [2.12.0])
 
 PYTHON_CFLAGS="`python-config --includes`"
-PYTHON_LIBS="`python-config --ldflags`"
+PYTHON_LIBS="`python-config --libs`"
+PYTHON_LDFLAGS="`python-config --ldflags`"
 
 AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_LDFLAGS)
 
 THUNARX_LIBDIR=`pkg-config --variable=libdir thunarx-2`
 AC_SUBST(THUNARX_LIBDIR)
diff --git a/src/Makefile.am b/src/Makefile.am
index 84fec0b..6e28e27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,14 +40,15 @@ thunarx_la_LDFLAGS =							\
 	-export-symbols-regex						\
 	initthunarx							\
 	$(THUNARX_LDFLAGS)						\
-	$(PYTHON_LIBS)							\
-	$(PYGTK_LIBS)							\
-	$(GNOMEPYTHON_LIBS)
+	$(PYTHON_LDFLAGS)							\
+	$(PYGTK_LDFLAGS)						\
+	$(GNOMEPYTHON_LDFLAGS)
 
 thunarx_la_LIBADD =							\
-	$(THUNARX_LIBDIR)						\
-	$(GNOMEPYTHON_LIBDIR)						\
-	$(PYGTK_LIBDIR)
+	$(THUNARX_LIBS)							\
+	$(PYTHON_LIBS)							\
+	$(GNOMEPYTHON_LIBS)						\
+	$(PYGTK_LIBS)
 
 thunarx_la_CFLAGS =							\
 	$(THUNARX_CFLAGS)						\