* #26839: dbus: move into client/dbus

daemon/configure.ac

@@ -374,6 +374,7 @@ AC_CONFIG_FILES([Makefile \
                  src/audio/codecs/Makefile \
                  src/config/Makefile \
                  src/client/Makefile \
+                 src/client/dbus/Makefile \
                  src/hooks/Makefile \
                  src/history/Makefile \
                  src/video/Makefile \

daemon/src/Makefile.am

@@ -41,7 +41,7 @@ libsflphone_la_LIBADD = \
 	$(IAX_LIB) \
 	./sip/libsiplink.la \
 	./audio/libaudio.la \
-	./client/libclient.la \
+	./client/dbus/libclient.la \
 	./config/libconfig.la \
 	./hooks/libhooks.la \
 	./history/libhistory.la $(SFL_VIDEO_LIB) $(IM_LIB)

daemon/src/account.cpp

@@ -44,7 +44,7 @@
 #include "manager.h"
 
 #ifndef __ANDROID__
-#include "client/configurationmanager.h"
+#include "client/dbus/configurationmanager.h"
 #else
 #include "client/android/configurationmanager.h"
 #include "client/android/jni_callbacks.h"

daemon/src/audio/alsa/alsalayer.cpp

@@ -37,7 +37,7 @@
 #include "logger.h"
 #include "manager.h"
 #include "noncopyable.h"
-#include "client/configurationmanager.h"
+#include "client/dbus/configurationmanager.h"
 #include <ctime>
 
 #define SFL_ALSA_PERIOD_SIZE 160

daemon/src/audio/audioloop.cpp

@@ -34,7 +34,7 @@
 
 #include "audioloop.h"
 #include "manager.h"
-#include "client/callmanager.h"
+#include "client/dbus/callmanager.h"
 #include <cmath>
 #include <numeric>
 #include <cstring>

daemon/src/audio/audiortp/zrtp_session_callback.cpp

@@ -31,7 +31,7 @@
 #include "logger.h"
 #include "sip/sipcall.h"
 #include "client/client.h"
-#include "client/callmanager.h"
+#include "client/dbus/callmanager.h"
 #include "manager.h"
 
 #include <cstdlib>

daemon/src/client/Makefile.am

-include $(top_srcdir)/globals.mak
-
-noinst_LTLIBRARIES = libclient.la
-
-BUILT_SOURCES=                      \
-    callmanager-glue.h              \
-    configurationmanager-glue.h     \
-    instance-glue.h
-
-if SFL_VIDEO
-BUILT_SOURCES+=video_controls-glue.h
-video_controls-glue.h: video_controls-introspec.xml Makefile.am
-	dbusxx-xml2cpp $< --adaptor=$@
-endif
-
-# Rule to generate the binding headers
-callmanager-glue.h: callmanager-introspec.xml Makefile.am
-	dbusxx-xml2cpp $< --adaptor=$@
-
-# Rule to generate the binding headers
-configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
-	dbusxx-xml2cpp $< --adaptor=$@
-
-# Rule to generate the binding headers
-instance-glue.h: instance-introspec.xml Makefile.am
-	dbusxx-xml2cpp $< --adaptor=$@
-
-libclient_la_SOURCES = \
-    callmanager.cpp \
-    configurationmanager.cpp  \
-    instance.cpp  \
-    client.cpp
-
-if SFL_VIDEO
-libclient_la_SOURCES+=video_controls.cpp
-endif
-
-if USE_NETWORKMANAGER
-libclient_la_SOURCES += networkmanager.cpp
-NETWORKMANAGER=-DUSE_NETWORKMANAGER
-else
-NETWORKMANAGER=
-endif
-
-libclient_la_CXXFLAGS = \
-            -DPREFIX=\"$(prefix)\" \
-            -DPROGSHAREDIR=\"${datadir}/sflphone\" \
-            $(NETWORKMANAGER)
-
-
-noinst_HEADERS =            \
-    callmanager.h           \
-    configurationmanager.h  \
-    instance.h              \
-    client.h                \
-    networkmanager_proxy.h  \
-    networkmanager.h        \
-    dbus_cpp.h        		\
-    $(BUILT_SOURCES)
-
-if SFL_VIDEO
-noinst_HEADERS+=video_controls.h
-endif
-
-# Dbus service file
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.sflphone.SFLphone.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-# Rule to make the service file with bindir expanded
-$(service_DATA): $(service_in_files) Makefile
-	sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
-
-EXTRA_DIST = README $(service_in_files) \
-			 callmanager-introspec.xml \
-			 configurationmanager-introspec.xml \
-			 instance-introspec.xml \
-			 org.freedesktop.NetworkManager.xml
-
-if SFL_VIDEO
-EXTRA_DIST += video_controls-introspec.xml
-endif
-
-CLEANFILES= \
-    $(BUILT_SOURCES) \
-	org.sflphone.SFLphone.service
+SUBDIRS=dbus

daemon/src/client/dbus/Makefile.am

+include $(top_srcdir)/globals.mak
+
+noinst_LTLIBRARIES = libclient.la
+
+BUILT_SOURCES=                      \
+    callmanager-glue.h              \
+    configurationmanager-glue.h     \
+    instance-glue.h
+
+if SFL_VIDEO
+BUILT_SOURCES+=video_controls-glue.h
+video_controls-glue.h: video_controls-introspec.xml Makefile.am
+	dbusxx-xml2cpp $< --adaptor=$@
+endif
+
+# Rule to generate the binding headers
+callmanager-glue.h: callmanager-introspec.xml Makefile.am
+	dbusxx-xml2cpp $< --adaptor=$@
+
+# Rule to generate the binding headers
+configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
+	dbusxx-xml2cpp $< --adaptor=$@
+
+# Rule to generate the binding headers
+instance-glue.h: instance-introspec.xml Makefile.am
+	dbusxx-xml2cpp $< --adaptor=$@
+
+libclient_la_SOURCES = \
+    callmanager.cpp \
+    configurationmanager.cpp  \
+    instance.cpp  \
+    client.cpp
+
+if SFL_VIDEO
+libclient_la_SOURCES+=video_controls.cpp
+endif
+
+if USE_NETWORKMANAGER
+libclient_la_SOURCES += networkmanager.cpp
+NETWORKMANAGER=-DUSE_NETWORKMANAGER
+else
+NETWORKMANAGER=
+endif
+
+libclient_la_CXXFLAGS = -I../ \
+            -DPREFIX=\"$(prefix)\" \
+            -DPROGSHAREDIR=\"${datadir}/sflphone\" \
+            $(NETWORKMANAGER)
+
+
+noinst_HEADERS =            \
+    callmanager.h           \
+    configurationmanager.h  \
+    instance.h              \
+    ../client.h             \
+    networkmanager_proxy.h  \
+    networkmanager.h        \
+    dbus_cpp.h        		\
+    $(BUILT_SOURCES)
+
+if SFL_VIDEO
+noinst_HEADERS+=video_controls.h
+endif
+
+# Dbus service file
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.sflphone.SFLphone.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+# Rule to make the service file with bindir expanded
+$(service_DATA): $(service_in_files) Makefile
+	sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
+
+EXTRA_DIST = README $(service_in_files) \
+			 callmanager-introspec.xml \
+			 configurationmanager-introspec.xml \
+			 instance-introspec.xml \
+			 org.freedesktop.NetworkManager.xml
+
+if SFL_VIDEO
+EXTRA_DIST += video_controls-introspec.xml
+endif
+
+CLEANFILES= \
+    $(BUILT_SOURCES) \
+	org.sflphone.SFLphone.service

daemon/src/client/client.cpp → daemon/src/client/dbus/client.cpp

@@ -33,7 +33,7 @@
 #endif
 
 #include <cstdlib>
-#include "client.h"
+#include "client/client.h"
 #include "global.h"
 #include "manager.h"
 #include "logger.h"