diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2011-12-21 14:25:09 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2012-01-17 11:04:37 +0100 |
| commit | ea3ed009ea63965d09afab7eb3dd41144b0932cf (patch) | |
| tree | a108b4d90e447ce8b0e7dd42cddf70b490068984 | |
| parent | e4d6c154adb40cfd482f474caf5c9800ab776c4a (diff) | |
autotools: moved definition of gdbus_dir
The definition is needed in various places, so putting it into the
top-level Makefile.am is cleaner.
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | src/dbus/server/server.am | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b7fd1f8d..10f5b121 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,15 @@ endif SUBDIRS += . +# choose D-Bus implementation +if COND_GIO_GDBUS +gdbus_dir = $(top_srcdir)/src/gdbusxx +gdbus_build_dir = src/gdbusxx +else +gdbus_dir = $(top_srcdir)/src/gdbus +gdbus_build_dir = src/gdbus +endif + disted_docs = distbin_docs = diff --git a/src/dbus/server/server.am b/src/dbus/server/server.am index fe8d3b86..1c36fdda 100644 --- a/src/dbus/server/server.am +++ b/src/dbus/server/server.am @@ -46,12 +46,6 @@ src_dbus_server_libsyncevodbusserver_la_SOURCES = \ dist_pkgdata_DATA += src/dbus/server/bluetooth_products.ini -if COND_GIO_GDBUS -gdbus_dir = $(top_srcdir)/src/gdbusxx -else -gdbus_dir = $(top_srcdir)/src/gdbus -endif - src_dbus_server_libsyncevodbusserver_la_LIBADD = $(KEYRING_LIBS) $(LIBNOTIFY_LIBS) $(MLITE_LIBS) $(KDE_KWALLET_LIBS) $(DBUS_LIBS) $(LIBSOUP_LIBS) src_dbus_server_libsyncevodbusserver_la_CPPFLAGS = -DHAVE_CONFIG_H -DSYNCEVOLUTION_LOCALEDIR=\"${SYNCEVOLUTION_LOCALEDIR}\" -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir) -I$(gdbus_dir) $(BACKEND_CPPFLAGS) src_dbus_server_libsyncevodbusserver_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(SYNTHESIS_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(LIBSOUP_CFLAGS) $(KEYRING_CFLAGS) $(LIBNOTIFY_CFLAGS) $(MLITE_CFLAGS) $(KDE_KWALLET_CFLAGS) $(SYNCEVO_WFLAGS) |