From 91eb17a7a27775802aeea4b34eaf1841a52651e3 Mon Sep 17 00:00:00 2001 From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Date: Wed, 7 Apr 2010 10:11:48 -0400 Subject: [PATCH] [#3144] Linking statically against libdbus-c++ --- build_tarball.sh | 0 sflphone-common/libs/dbus-c++/src/Makefile.am | 4 +++- sflphone-common/libs/pjproject/autogen.sh | 0 sflphone-common/src/Makefile.am | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 build_tarball.sh mode change 100644 => 100755 sflphone-common/libs/pjproject/autogen.sh diff --git a/build_tarball.sh b/build_tarball.sh old mode 100644 new mode 100755 diff --git a/sflphone-common/libs/dbus-c++/src/Makefile.am b/sflphone-common/libs/dbus-c++/src/Makefile.am index 26520ff252..8a5b7d52d7 100644 --- a/sflphone-common/libs/dbus-c++/src/Makefile.am +++ b/sflphone-common/libs/dbus-c++/src/Makefile.am @@ -34,10 +34,12 @@ HEADER_FILES = \ $(HEADER_DIR)/eventloop-integration.h \ $(GLIB_H) + + # noinst_lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/ noinst_HEADERS = $(HEADER_FILES) -pkglib_LTLIBRARIES = libdbus-c++-1.la +noinst_LTLIBRARIES = libdbus-c++-1.la libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP) libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) diff --git a/sflphone-common/libs/pjproject/autogen.sh b/sflphone-common/libs/pjproject/autogen.sh old mode 100644 new mode 100755 diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am index 10d240d25e..09ce81355d 100644 --- a/sflphone-common/src/Makefile.am +++ b/sflphone-common/src/Makefile.am @@ -78,6 +78,7 @@ noinst_HEADERS = \ libsflphone_la_LIBADD = \ $(src)/libs/utilspp/libutilspp.la \ $(src)/libs/iax2/libiax2.la \ + $(src)/libs/dbus-c++/src/libdbus-c++-1.la \ $(IAX_LIB) \ ./sip/libsiplink.la \ ./audio/libaudio.la \ -- GitLab