From 16274a0d248dded576883ebb45a3563d4a0c719d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Wed, 27 Jul 2011 10:40:19 -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
Conflicts:
sflphone-common/src/Makefile.am
---
sflphone-common/src/Makefile.am | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am
index 3b2eef2031..d14c7eb21f 100644
--- a/sflphone-common/src/Makefile.am
+++ b/sflphone-common/src/Makefile.am
@@ -7,21 +7,7 @@ libexec_PROGRAMS = sflphoned
SUBDIRS = dbus audio config plug-in hooks history sip iax im
-# 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 \
- fileutils.cpp
+sflphoned_SOURCES = main.cpp
# Redefine the USE_IAX variable here, so that it could be used in managerimpl
if USE_IAX
@@ -104,5 +90,15 @@ 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 \
+ fileutils.cpp
--
GitLab