summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNick Schermer <nick@xfce.org>2011-05-25 22:51:39 +0200
committerNick Schermer <nick@xfce.org>2011-05-25 22:53:32 +0200
commit75c9a6421315bfb50fcedc296ee080c728a5affd (patch)
tree6185373c27df08952eaecd6fe374ff345864930b /common
parent1f78c182c4277e31e927656ea69f5c0b64fe6f79 (diff)
downloadxfconf-75c9a6421315bfb50fcedc296ee080c728a5affd.tar.gz
Cleanup Makefile.am files a bit.
Diffstat (limited to 'common')
-rw-r--r--common/Makefile.am30
1 files changed, 23 insertions, 7 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