[Xfce4-commits] <thunarx-python:master> Cleaned up configure.ac/Makefile.am a bit

[Adam Plumb]

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

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

    Cleaned up configure.ac/Makefile.am a bit

 configure.ac.in |   16 ----------------
 src/Makefile.am |   23 +++++------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 8cfacad..dd62fee 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -65,11 +65,8 @@ dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([PYGTK], [pygtk-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GNOMEPYTHON], [gnome-python-2.0], [2.12.0])
@@ -111,19 +108,6 @@ dnl *** Check for linker optimizations ***
 dnl **************************************
 XDT_FEATURE_LINKER_OPTS()
 
-dnl *********************************
-dnl *** Substitute platform flags ***
-dnl *********************************
-AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
-AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
-AC_SUBST([PLATFORM_CPPFLAGS])
-AC_MSG_CHECKING([PLATFORM_CFLAGS])
-AC_MSG_RESULT([$PLATFORM_CFLAGS])
-AC_SUBST([PLATFORM_CFLAGS])
-AC_MSG_CHECKING([PLATFORM_LDFLAGS])
-AC_MSG_RESULT([$PLATFORM_LDFLAGS])
-AC_SUBST([PLATFORM_LDFLAGS])
-
 AC_OUTPUT([
 Makefile
 src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index ba48d6c..84fec0b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"thunarx-python\"				\
 	-DEXO_API_SUBJECT_TO_CHANGE					\
-	-DLIBEXECDIR=\"$(libexecdir)\"					\
-	$(PLATFORM_CPPFLAGS)
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 extensionsdir = $(libdir)/thunarx-2
 extensions_LTLIBRARIES =						\
@@ -17,14 +16,8 @@ thunarx_python_la_SOURCES =						\
 	thunarx-python-object.c						\
 	thunarx-python-object.h
 
-thunarx_python_la_CPPFLAGS =						\
-	$(AM_CPPFLAGS)
-
 thunarx_python_la_CFLAGS =						\
-	$(PLATFORM_CFLAGS)						\
 	$(THUNARX_CFLAGS)						\
-	$(EXO_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(PYTHON_CFLAGS)						\
 	$(PYGTK_CFLAGS)							\
 	$(GNOMEPYTHON_CFLAGS)
@@ -33,10 +26,7 @@ thunarx_python_la_LDFLAGS =						\
 	-avoid-version							\
 	-export-dynamic							\
 	-module								\
-	$(PLATFORM_LDFLAGS)						\
 	$(THUNARX_LDFLAGS)						\
-	$(EXO_LDFLAGS)							\
-	$(LIBXFCE4UTIL_LDFLAGS)						\
 	$(PYTHON_LIBS)							\
 	$(PYGTK_LIBS)							\
 	$(GNOMEPYTHON_LIBS)
@@ -49,21 +39,18 @@ thunarx_la_LDFLAGS =							\
 	-avoid-version							\
 	-export-symbols-regex						\
 	initthunarx							\
-	$(PLATFORM_LDFLAGS)						\
 	$(THUNARX_LDFLAGS)						\
-	$(EXO_LDFLAGS)							\
-	$(LIBXFCE4UTIL_LDFLAGS)						\
 	$(PYTHON_LIBS)							\
 	$(PYGTK_LIBS)							\
 	$(GNOMEPYTHON_LIBS)
 
-thunarx_la_LIBADD = $(THUNARX_LIBDIR) $(GNOMEPYTHON_LIBDIR) $(PYGTK_LIBDIR)
+thunarx_la_LIBADD =							\
+	$(THUNARX_LIBDIR)						\
+	$(GNOMEPYTHON_LIBDIR)						\
+	$(PYGTK_LIBDIR)
 
 thunarx_la_CFLAGS =							\
-	$(PLATFORM_CFLAGS)						\
 	$(THUNARX_CFLAGS)						\
-	$(EXO_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(PYTHON_CFLAGS)						\
 	$(PYGTK_CFLAGS)							\
 	$(GNOMEPYTHON_CFLAGS)