diff options
| author | Nick Schermer <nick@xfce.org> | 2011-05-25 22:51:39 +0200 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2011-05-25 22:53:32 +0200 |
| commit | 75c9a6421315bfb50fcedc296ee080c728a5affd (patch) | |
| tree | 6185373c27df08952eaecd6fe374ff345864930b /xfconfd | |
| parent | 1f78c182c4277e31e927656ea69f5c0b64fe6f79 (diff) | |
| download | xfconf-75c9a6421315bfb50fcedc296ee080c728a5affd.tar.gz | |
Cleanup Makefile.am files a bit.
Diffstat (limited to 'xfconfd')
| -rw-r--r-- | xfconfd/Makefile.am | 26 |
1 files changed, 16 insertions, 10 deletions
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) |