Anonymous

diff -Nr -U 24 a/src/dbus/Makefile.am b/src/dbus/Makefile.am--- a/src/dbus/Makefile.am	2011-05-12 14:30:46.740511893 +0300+++ b/src/dbus/Makefile.am	2011-05-12 14:31:37.283970445 +0300@@ -1,48 +1,46 @@ lib_LTLIBRARIES = libsyncevo-dbus.la  SUBDIRS = interfaces  if ENABLE_QT_DBUS SUBDIRS += qt endif -if COND_GUI AM_CPPFLAGS = -I$(top_srcdir) -Iinterfaces $(SYNTHESIS_CFLAGS)  DISTCLEANFILES = syncevo-dbus.pc EXTRA_DIST = syncevo-dbus.pc.in pkgconfig_DATA = syncevo-dbus.pc pkgconfigdir = $(libdir)/pkgconfig  noinst_PROGRAMS = test-syncevo-dbus  test_syncevo_dbus_SOURCES = test.c test_syncevo_dbus_LDADD = $(DBUS_GLIB_LIBS) libsyncevo-dbus.la test_syncevo_dbus_CFLAGS = $(DBUS_GLIB_CFLAGS)  nodist_libsyncevo_dbus_la_SOURCES = \ 	interfaces/syncevo-marshal.c  libsyncevo_dbus_la_SOURCES = \ 	$(syncevo_dbus_headers) \ 	syncevo-dbus-types.c \ 	syncevo-server.c \ 	syncevo-session.c  libsyncevo_dbus_la_CFLAGS = \ 	-I$(top_srcdir) \ 	-I$(top_builddir) \ 	$(DBUS_GLIB_CFLAGS)  libsyncevo_dbus_la_LIBADD = \ 	$(DBUS_GLIB_LIBS)  syncevo_dbus_headers = \ 	syncevo-dbus-types.h \ 	syncevo-server.h \ 	syncevo-session.h  libsyncevo_dbus_includedir = $(includedir)/syncevo-dbus libsyncevo_dbus_include_HEADERS =	\ 	$(syncevo_dbus_headers)-endifdiff -Nr -U 24 a/src/Makefile-gen.am b/src/Makefile-gen.am--- a/src/Makefile-gen.am	2011-05-12 14:30:39.080745523 +0300+++ b/src/Makefile-gen.am	2011-05-12 14:31:30.447178932 +0300@@ -1,49 +1,49 @@ include $(top_srcdir)/m4-repo/autotroll.mk  BACKENDS = @BACKENDS@  # start with building nothing and add more targets below SUBDIRS = EXTRA_PROGRAMS = TESTS = bin_PROGRAMS = bin_SCRIPTS = nodist_bin_SCRIPTS = libexec_PROGRAMS = libexec_SCRIPTS = nobase_dist_template_DATA = DISTCLEANFILES = CLEANFILES = BUILT_SOURCES =  service_in_files = org.syncevolution.service.in if COND_DBUS servicedir = $(DBUS_SERVICES_DIR) service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@-SUBDIRS += gdbus+SUBDIRS += gdbus dbus endif if ENABLE_GNOME_BLUETOOTH_PANEL SUBDIRS += gnome-bluetooth endif if COND_CORE SUBDIRS += $(SYNTHESIS_SUBDIR) syncevo $(BACKENDS) bin_PROGRAMS += syncevolution bin_SCRIPTS += synccompare nobase_dist_template_DATA += $(TEMPLATE_FILES) else SUBDIRS += $(SYNTHESIS_SUBDIR_INCLUDES) endif if COND_GUI SUBDIRS += dbus gtk-ui else if COND_DOC SUBDIRS += dbus endif endif  DIST_SUBDIRS = gdbus dbus syncevo $(BACKENDS) gtk-ui gnome-bluetooth synthesis-includes  AM_CPPFLAGS = $(SUBDIRS:%=-I$(srcdir)/%) -I$(srcdir)/../test -I$(top_srcdir) $(BACKEND_CPPFLAGS)