From 92edf323d4df178952d1c17f93a26d67cdf599f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@savoirfairelinux.com> Date: Mon, 4 Jul 2011 13:02:18 -0400 Subject: [PATCH] Move all .cpp files from sflphoned target to libsflphone.la, except main.c That way we can link libsflphone.la to tests --- sflphone-common/src/Makefile.am | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am index 1b7cfcbbb5..d5684dac13 100644 --- a/sflphone-common/src/Makefile.am +++ b/sflphone-common/src/Makefile.am @@ -7,20 +7,7 @@ libexec_PROGRAMS = sflphoned SUBDIRS = dbus audio config plug-in hooks history sip iax im video -# Add here the cpp files to be build with sflphone -sflphoned_SOURCES = \ - conference.cpp \ - voiplink.cpp \ - main.cpp \ - preferences.cpp \ - managerimpl.cpp \ - managerimpl_registration.cpp \ - eventthread.cpp \ - accountcreator.cpp \ - call.cpp \ - account.cpp \ - logger.cpp \ - numbercleaner.cpp +sflphoned_SOURCES = main.cpp # Redefine the USE_IAX variable here, so that it could be used in managerimpl if USE_IAX @@ -104,5 +91,14 @@ libsflphone_la_CFLAGS = \ @yaml_CFLAGS@ \ @xml_CFLAGS@ -libsflphone_la_SOURCES = - +libsflphone_la_SOURCES = conference.cpp \ + voiplink.cpp \ + preferences.cpp \ + managerimpl.cpp \ + managerimpl_registration.cpp \ + eventthread.cpp \ + accountcreator.cpp \ + call.cpp \ + account.cpp \ + logger.cpp \ + numbercleaner.cpp -- GitLab