[Xfce4-commits] <xfconf:master> Cleanup Makefile.am files a bit.

[Nick Schermer]

Updating branch refs/heads/master
         to 75c9a6421315bfb50fcedc296ee080c728a5affd (commit)
       from 1f78c182c4277e31e927656ea69f5c0b64fe6f79 (commit)

commit 75c9a6421315bfb50fcedc296ee080c728a5affd
Author: Nick Schermer <nick at xfce.org>
Date:   Wed May 25 22:51:39 2011 +0200

    Cleanup Makefile.am files a bit.

 common/Makefile.am       |   30 +++++++++++++++++++++++-------
 xfconf-query/Makefile.am |   19 ++++++++++++-------
 xfconf/Makefile.am       |   21 +++++++++++++--------
 xfconfd/Makefile.am      |   26 ++++++++++++++++----------
 4 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index a73ae2b..c81491b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,4 +1,10 @@
 
+INCLUDES = \
+	-I$(top_srcdir) \
+	-DLIBXFCONF_COMPILATION \
+	-DG_LOG_DOMAIN=\"xfconf-common\" \
+	$(PLATFORM_CPPFLAGS)
+
 noinst_LTLIBRARIES = \
 	libxfconf-common.la \
 	libxfconf-gvaluefuncs.la
@@ -9,24 +15,34 @@ libxfconf_common_la_SOURCES = \
 	xfconf-marshal.h
 
 libxfconf_common_la_CFLAGS = \
-	-DLIBXFCONF_COMPILATION \
-	-I$(top_srcdir) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(PLATFORM_CFLAGS)
+
+libxfconf_common_la_LDFLAGS = \
+	$(PLATFORM_LDFLAGS)
+
+libxfconf_common_la_LIBADD = \
+	$(GLIB_LIBS)
 
 libxfconf_built_sources = \
 	xfconf-alias.h \
 	xfconf-aliasdef.c
 
-
 libxfconf_gvaluefuncs_la_SOURCES = \
 	xfconf-gvaluefuncs.c \
 	xfconf-gvaluefuncs.h
 
 libxfconf_gvaluefuncs_la_CFLAGS = \
-	-DLIBXFCONF_COMPILATION \
-	-I$(top_srcdir) \
 	$(GLIB_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS)
+	$(DBUS_GLIB_CFLAGS) \
+	$(PLATFORM_CFLAGS)
+
+libxfconf_gvaluefuncs_la_LDFLAGS = \
+	$(PLATFORM_LDFLAGS)
+
+libxfconf_gvaluefuncs_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(DBUS_GLIB_LIBS)
 
 
 if MAINTAINER_MODE
diff --git a/xfconf-query/Makefile.am b/xfconf-query/Makefile.am
index 2fb7136..eb7a2eb 100644
--- a/xfconf-query/Makefile.am
+++ b/xfconf-query/Makefile.am
@@ -1,4 +1,12 @@
 
+INCLUDES = \
+	-I$(top_srcdir)/common \
+	-DG_LOG_DOMAIN=\"xfconf-query\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSRCDIR=\"$(top_srcdir)\" \
+	-DLOCALEDIR=\"$(localedir)\" \
+	$(PLATFORM_CPPFLAGS)
+
 bin_PROGRAMS = xfconf-query
 
 xfconf_query_SOURCES = \
@@ -8,10 +16,10 @@ xfconf_query_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
-	-I$(top_srcdir)/common \
-	-DDATADIR=\"$(datadir)\" \
-	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\"
+	$(PLATFORM_CFLAGS)
+
+xfconf_query_LDFLAGS = \
+	$(PLATFORM_LDFLAGS)
 
 xfconf_query_LDADD = \
 	$(top_builddir)/common/libxfconf-gvaluefuncs.la \
@@ -19,6 +27,3 @@ xfconf_query_LDADD = \
 	$(GLIB_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(DBUS_GLIB_LIBS)
-
-INCLUDES = \
-	-I$(top_srcdir)
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
index f636564..7c3e817 100644
--- a/xfconf/Makefile.am
+++ b/xfconf/Makefile.am
@@ -1,4 +1,13 @@
 
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir) \
+	-I$(top_builddir)/common \
+	-DLIBXFCONF_COMPILATION \
+	-DG_LOG_DOMAIN=\"xfconf\" \
+	$(PLATFORM_CPPFLAGS)
+
 lib_LTLIBRARIES = libxfconf-0.la
 
 libxfconfincludedir = $(includedir)/xfce4/xfconf-$(LIBXFCONF_VERSION_API)/xfconf
@@ -21,21 +30,17 @@ libxfconf_0_la_SOURCES = \
 	$(top_srcdir)/common/xfconf-types.c
 
 libxfconf_0_la_CFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/common \
-	-I$(top_builddir) \
-	-I$(top_builddir)/common \
-	-DLIBXFCONF_COMPILATION \
-	-DG_LOG_DOMAIN=\"xfconf\" \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS)
+	$(DBUS_GLIB_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 libxfconf_0_la_LDFLAGS = \
 	-export-dynamic \
 	-version-info $(LIBXFCONF_VERINFO) \
 	-export-symbols-regex "^[^_].*" \
-	-no-undefined
+	-no-undefined \
+	$(PLATFORM_LDFLAGS)
 
 libxfconf_0_la_LIBADD = \
 	$(top_builddir)/common/libxfconf-common.la \
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 7becaf5..7a1e66d 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -1,4 +1,15 @@
 
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir) \
+	-I$(top_builddir)/common \
+	-DG_LOG_DOMAIN=\"xfconfd\" \
+	-DLIBXFCONF_COMPILATION \
+	-DBINDIR=\"$(bindir)\" \
+	-DLOCALEDIR=\"$(localedir)\" \
+	$(PLATFORM_CPPFLAGS)
+
 xfconfddir = $(HELPER_PATH_PREFIX)/xfce4/xfconf
 xfconfd_PROGRAMS = xfconfd
 
@@ -25,18 +36,14 @@ xfconfd_SOURCES = \
 	$(top_srcdir)/common/xfconf-types.c
 
 xfconfd_CFLAGS = \
-	-DG_LOG_DOMAIN=\"xfconfd\" \
-	-DLIBXFCONF_COMPILATION \
-	-DBINDIR=\"$(bindir)\" \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/common \
-	-I$(top_builddir) \
-	-I$(top_builddir)/common \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
-	$(LIBXFCE4UTIL_CFLAGS)
+	$(LIBXFCE4UTIL_CFLAGS) \
+	$(PLATFORM_CFLAGS)
+
+xfconfd_LDFLAGS = \
+	$(PLATFORM_LDFLAGS)
 
 if ENABLE_PROFILING
 xfconfd_CFLAGS += -pg
@@ -50,7 +57,6 @@ xfconfd_LDADD = \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)
 
-
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.Xfconf.service.in
 service_DATA = $(service_in_files:.service.in=.service)