From 419cb97bc932c2aeff272c2a9c075c16f5dd0974 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Mon, 28 Apr 2014 18:48:28 -0400
Subject: [PATCH] client: split the dbus Makefile into generic parts
Change-Id: Ic5ffa4329bb86e1a2208ab0e7e9d842e5d591c47
Refs: #46447
---
daemon/src/Makefile.am | 2 +-
daemon/src/client/Makefile.am | 27 +++++++++++++++++++++++++++
daemon/src/client/dbus/Makefile.am | 25 ++++++-------------------
3 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index bd4f4eb171..4799532575 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -41,7 +41,7 @@ libsflphone_la_LIBADD = \
$(IAX_LIB) \
./sip/libsiplink.la \
./audio/libaudio.la \
- ./client/dbus/libclient.la \
+ ./client/libclient.la \
./config/libconfig.la \
./hooks/libhooks.la \
./history/libhistory.la $(SFL_VIDEO_LIB) $(IM_LIB)
diff --git a/daemon/src/client/Makefile.am b/daemon/src/client/Makefile.am
index ee8f397a3a..0b0f066c85 100644
--- a/daemon/src/client/Makefile.am
+++ b/daemon/src/client/Makefile.am
@@ -1 +1,28 @@
+include $(top_srcdir)/globals.mak
+
+noinst_LTLIBRARIES = libclient.la
+
+noinst_HEADERS = callmanager.h \
+ configurationmanager.h \
+ client.h
+
+if SFL_PRESENCE
+PRESENCE_SRC = presencemanager.cpp
+noinst_HEADERS += presencemanager.h
+endif
+
+if SFL_VIDEO
+noinst_HEADERS += video_controls.h
+endif
+
SUBDIRS=dbus
+
+libclient_la_LIBADD = dbus/libclient_dbus.la
+
+libclient_la_SOURCES = callmanager.cpp \
+ configurationmanager.cpp \
+ $(PRESENCE_SRC)
+
+libclient_la_CXXFLAGS = -I./ \
+ -DPREFIX=\"$(prefix)\" \
+ -DPROGSHAREDIR=\"${datadir}/sflphone\"
diff --git a/daemon/src/client/dbus/Makefile.am b/daemon/src/client/dbus/Makefile.am
index df8764c0dc..7db4a433c5 100644
--- a/daemon/src/client/dbus/Makefile.am
+++ b/daemon/src/client/dbus/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/globals.mak
-noinst_LTLIBRARIES = libclient.la
+noinst_LTLIBRARIES = libclient_dbus.la
BUILT_SOURCES= \
callmanager-glue.h \
@@ -31,51 +31,38 @@ configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
instance-glue.h: instance-introspec.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
-libclient_la_SOURCES = \
+libclient_dbus_la_SOURCES = \
callmanager_dbus.cpp \
- ../callmanager.cpp \
configurationmanager_dbus.cpp \
- ../configurationmanager.cpp \
instance.cpp \
client.cpp
if SFL_PRESENCE
-libclient_la_SOURCES+=../presencemanager.cpp presencemanager_dbus.cpp
+libclient_dbus_la_SOURCES += presencemanager_dbus.cpp
endif
if SFL_VIDEO
-libclient_la_SOURCES+=video_controls.cpp
+libclient_dbus_la_SOURCES += video_controls.cpp
endif
if USE_NETWORKMANAGER
-libclient_la_SOURCES += networkmanager.cpp
+libclient_dbus_la_SOURCES += networkmanager.cpp
NETWORKMANAGER=-DUSE_NETWORKMANAGER
endif
-libclient_la_CXXFLAGS = -I../ \
+libclient_dbus_la_CXXFLAGS = -I../ \
-DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(NETWORKMANAGER) \
$(DBUSCPP_CFLAGS)
noinst_HEADERS = \
- ../callmanager.h \
- ../configurationmanager.h \
instance.h \
- ../client.h \
networkmanager_proxy.h \
networkmanager.h \
dbus_cpp.h \
$(BUILT_SOURCES)
-if SFL_PRESENCE
-noinst_HEADERS+=../presencemanager.h
-endif
-
-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
--
GitLab