maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autotools: moved definition of gdbus_dir 

The definition is needed in various places, so putting it into the
top-level Makefile.am is cleaner.
This commit is contained in:
Patrick Ohly 2011-12-21 14:25:09 +01:00
parent e4d6c154ad
commit ea3ed009ea
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -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 =

6
src/dbus/server/server.am
View File

@ -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)