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

Moved syncevo-dbus-server.cpp and friends to dbus-server sub-directory.

Browse source 
This is the initial step in preperation for breaking up the .cpp file
into smaller compilation units.
This commit is contained in:
Chris Kühl 2011-06-06 11:07:28 +02:00 committed by Patrick Ohly
parent d436e331d6
commit a783c0f940
10 changed files with 291 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configure-post.in
View file

@ -158,7 +158,23 @@ SYNCEVOLUTION_LIBS=`pwd`/src/syncevo/libsyncevolution.la
AC_SUBST(SYNCEVOLUTION_CFLAGS)
AC_SUBST(SYNCEVOLUTION_LIBS)
AC_CONFIG_FILES(Makefile src/dbus/interfaces/Makefile src/gdbus/Makefile src/dbus/Makefile src/dbus/glib/Makefile src/Makefile src/syncevo/Makefile src/syncevo/syncevolution.pc src/syncevo/configs/Makefile src/synthesis-includes/Makefile src/gtk-ui/Makefile po/Makefile.in test/Makefile src/dbus/glib/syncevo-dbus.pc)
AC_CONFIG_FILES(
Makefile
src/dbus/interfaces/Makefile
src/gdbus/Makefile
src/dbus/Makefile
src/dbus/glib/Makefile
src/dbus-server/Makefile
src/Makefile
src/syncevo/Makefile
src/syncevo/syncevolution.pc
src/syncevo/configs/Makefile
src/synthesis-includes/Makefile
src/gtk-ui/Makefile
po/Makefile.in
test/Makefile
src/dbus/glib/syncevo-dbus.pc)
AC_OUTPUT
echo

2
po/POTFILES.in
View file

@ -7,4 +7,4 @@ src/gtk-ui/sync-gtk.desktop.in
src/gtk-ui/sync-config-widget.c
src/gnome-bluetooth/syncevolution.c
src/NotificationBackendLibnotify.cpp
src/syncevo-dbus-server.cpp
src/dbus-server/syncevo-dbus-server.cpp

5
src/.gitignore vendored
View file

@ -3,10 +3,7 @@
/synccompare
/client-test
/build-synthesis
/org.syncevolution.service
/syncevo-dbus-server
/syncevo-dbus-server-startup.sh
/syncevo-dbus-server.desktop
/syncevo-http-server
/syncevo-dbus-server
/syncevo-phone-config
/testcases

42
src/Makefile-gen.am
View file

@ -15,14 +15,6 @@ nobase_dist_template_DATA =
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
endif
if ENABLE_GNOME_BLUETOOTH_PANEL
SUBDIRS += gnome-bluetooth
endif
@ -34,37 +26,24 @@ nobase_dist_template_DATA += $(TEMPLATE_FILES)
else
SUBDIRS += $(SYNTHESIS_SUBDIR_INCLUDES)
endif
if COND_DBUS
SUBDIRS += gdbus dbus-server
endif
SUBDIRS += dbus
if COND_GUI
SUBDIRS += gtk-ui
else
endif
DIST_SUBDIRS = gdbus dbus syncevo $(BACKENDS) gtk-ui gnome-bluetooth synthesis-includes
DIST_SUBDIRS = gdbus dbus syncevo $(BACKENDS) dbus-server gtk-ui gnome-bluetooth synthesis-includes
AM_CPPFLAGS = $(SUBDIRS:%=-I$(srcdir)/%) -I$(srcdir)/../test -I$(top_srcdir) $(BACKEND_CPPFLAGS)
DISTCLEANFILES += synccompare
CLEANFILES += libstdc++.a client-test $(CLIENT_LIB_TEST_FILES) \
org.syncevolution.service \
$(SYNCEVO_DBUS_SERVER_DESKTOP) $(SYNCEVO_DBUS_SERVER_SCRIPT)
SYNCEVO_DBUS_SERVER_SCRIPT = syncevo-dbus-server-startup.sh
SYNCEVO_DBUS_SERVER_SCRIPT_IN = $(SYNCEVO_DBUS_SERVER_SCRIPT).in
autostartdir = $(sysconfdir)/xdg/autostart
SYNCEVO_DBUS_SERVER_DESKTOP = syncevo-dbus-server.desktop
SYNCEVO_DBUS_SERVER_DESKTOP_IN = $(SYNCEVO_DBUS_SERVER_DESKTOP).in
CLEANFILES += libstdc++.a client-test $(CLIENT_LIB_TEST_FILES)
if COND_DBUS
libexec_PROGRAMS += syncevo-dbus-server
nodist_bin_SCRIPTS += syncevo-http-server
libexec_SCRIPTS += $(SYNCEVO_DBUS_SERVER_SCRIPT)
$(libexec_SCRIPTS): $(SYNCEVO_DBUS_SERVER_SCRIPT_IN) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
autostart_DATA = $(SYNCEVO_DBUS_SERVER_DESKTOP)
$(autostart_DATA): $(SYNCEVO_DBUS_SERVER_DESKTOP_IN) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
endif
syncevo-http-server: $(srcdir)/../test/syncevo-http-server.py
cp $< $@
@ -81,7 +60,7 @@ else
SYNCEVOLUTION_LDADD += $(SYNCSOURCES)
SYNCEVOLUTION_DEP += $(SYNCSOURCES)
endif
EXTRA_DIST = shlibs.local Makefile-gen.am $(service_in_files) $(SYNCEVO_DBUS_SERVER_SCRIPT_IN) $(SYNCEVO_DBUS_SERVER_DESKTOP_IN)
EXTRA_DIST = shlibs.local Makefile-gen.am
TEMPLATE_FILES = @TEMPLATE_FILES@
templatedir = $(datadir)/syncevolution/
@ -181,7 +160,11 @@ distclean-local:
rm -rf $(SYNTHESIS_SUBDIR)
rm -rf $(CLEAN_CLIENT_SRC)
# Do the linking here, as with all SyncEvolution executables.
# Sources are compiled in dbus-server.
if COND_DBUS
libexec_PROGRAMS += syncevo-dbus-server
syncevo_dbus_server_SOURCES = \
NotificationBackendBase.h \
NotificationBackendNoop.h \
@ -194,17 +177,16 @@ syncevo_dbus_server_SOURCES = \
NotificationManagerBase.h \
NotificationManagerFactory.h \
NotificationManagerFactory.cpp \
syncevo-dbus-server.cpp \
$(CORE_SOURCES)
if ENABLE_UNIT_TESTS
nodist_syncevo_dbus_server_SOURCES = ../test/test.cpp
endif
syncevo_dbus_server_LDADD = gdbus/libgdbussyncevo.la $(CORE_LDADD) $(KEYRING_LIBS) $(LIBNOTIFY_LIBS) $(MLITE_LIBS) $(KDE_KWALLET_LIBS) $(DBUS_LIBS)
syncevo_dbus_server_LDADD = dbus-server/libsyncevodbusserver.la gdbus/libgdbussyncevo.la $(CORE_LDADD) $(KEYRING_LIBS) $(LIBNOTIFY_LIBS) $(MLITE_LIBS) $(KDE_KWALLET_LIBS) $(DBUS_LIBS)
syncevo_dbus_server_CPPFLAGS = -DHAVE_CONFIG_H -I$(srcdir)/gdbus $(AM_CPPFLAGS) -DSYNCEVOLUTION_LOCALEDIR=\"${SYNCEVOLUTION_LOCALEDIR}\"
syncevo_dbus_server_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(LIBSOUP_CFLAGS) $(KEYRING_CFLAGS) $(LIBNOTIFY_CFLAGS) $(MLITE_CFLAGS) $(KDE_KWALLET_CFLAGS)
syncevo_dbus_server_LDFLAGS = $(CORE_LD_FLAGS) $(LIBSOUP_LIBS)
syncevo_dbus_server_DEPENDENCIES = gdbus/libgdbussyncevo.la $(EXTRA_LTLIBRARIES) $(CORE_DEP) $(SYNTHESIS_DEP)
syncevo_dbus_server_DEPENDENCIES = dbus-server/libsyncevodbusserver.la gdbus/libgdbussyncevo.la $(EXTRA_LTLIBRARIES) $(CORE_DEP) $(SYNTHESIS_DEP)
endif
# With --disable-shared autotools links against libfunambol.a which does not

3
src/dbus-server/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
/org.syncevolution.service
/syncevo-dbus-server-startup.sh
/syncevo-dbus-server.desktop

49
src/dbus-server/Makefile.am Normal file
View file

@ -0,0 +1,49 @@
noinst_LTLIBRARIES = libsyncevodbusserver.la
libsyncevodbusserver_la_SOURCES = \
../NotificationBackendBase.h \
../NotificationBackendNoop.h \
../NotificationBackendNoop.cpp \
../NotificationBackendLibnotify.h \
../NotificationBackendLibnotify.cpp \
../NotificationBackendMLite.h \
../NotificationBackendMLite.cpp \
../NotificationManager.h \
../NotificationManagerBase.h \
../NotificationManagerFactory.h \
../NotificationManagerFactory.cpp \
syncevo-dbus-server.cpp
libsyncevodbusserver_la_LIBADD = $(KEYRING_LIBS) $(LIBNOTIFY_LIBS) $(MLITE_LIBS) $(KDE_KWALLET_LIBS) $(DBUS_LIBS) $(LIBSOUP_LIBS)
libsyncevodbusserver_la_CPPFLAGS = -DHAVE_CONFIG_H -DSYNCEVOLUTION_LOCALEDIR=\"${SYNCEVOLUTION_LOCALEDIR}\" -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir) $(BACKEND_CPPFLAGS)
libsyncevodbusserver_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(SYNTHESIS_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(LIBSOUP_CFLAGS) $(KEYRING_CFLAGS) $(LIBNOTIFY_CFLAGS) $(MLITE_CFLAGS) $(KDE_KWALLET_CFLAGS)
# Deal with .service, .desktop and startup script files.
CLEANFILES = org.syncevolution.service \
$(SYNCEVO_DBUS_SERVER_DESKTOP) \
$(SYNCEVO_DBUS_SERVER_SCRIPT)
SYNCEVO_DBUS_SERVER_SCRIPT = syncevo-dbus-server-startup.sh
SYNCEVO_DBUS_SERVER_SCRIPT_IN = $(SYNCEVO_DBUS_SERVER_SCRIPT).in
autostartdir = $(sysconfdir)/xdg/autostart
SYNCEVO_DBUS_SERVER_DESKTOP = syncevo-dbus-server.desktop
SYNCEVO_DBUS_SERVER_DESKTOP_IN = $(SYNCEVO_DBUS_SERVER_DESKTOP).in
libexec_SCRIPTS = $(SYNCEVO_DBUS_SERVER_SCRIPT)
$(libexec_SCRIPTS): $(SYNCEVO_DBUS_SERVER_SCRIPT_IN) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
autostart_DATA = $(SYNCEVO_DBUS_SERVER_DESKTOP)
$(autostart_DATA): $(SYNCEVO_DBUS_SERVER_DESKTOP_IN) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
service_in_files = org.syncevolution.service.in
servicedir = $(DBUS_SERVICES_DIR)
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = $(service_in_files) \
$(SYNCEVO_DBUS_SERVER_SCRIPT_IN) \
$(SYNCEVO_DBUS_SERVER_DESKTOP_IN)

0
src/org.syncevolution.service.in → src/dbus-server/org.syncevolution.service.in
View file

0
src/syncevo-dbus-server-startup.sh.in → src/dbus-server/syncevo-dbus-server-startup.sh.in
View file

416
src/syncevo-dbus-server.cpp → src/dbus-server/syncevo-dbus-server.cpp
View file

File diff suppressed because it is too large Load diff

0
src/syncevo-dbus-server.desktop.in → src/dbus-server/syncevo-dbus-server.desktop.in
View file