GNOME.org
 

[ekiga] Split ekiga into an exec and helper libs

commit 26b60905aafce27bcddfd952ab2352860ac2de7c
Author: Julien Puydt <jpuydt gnome org>
Date:   Wed Jul 1 21:23:45 2009 +0200

    Split ekiga into an exec and helper libs

 configure.ac                                    |   30 +++++++++++++++++++----
 lib/engine/account/Makefile.am                  |    4 +-
 lib/engine/addressbook/Makefile.am              |    4 +-
 lib/engine/audioinput/Makefile.am               |    4 +-
 lib/engine/audiooutput/Makefile.am              |    4 +-
 lib/engine/chat/Makefile.am                     |    4 +-
 lib/engine/components/evolution/Makefile.am     |    1 -
 lib/engine/components/gstreamer/Makefile.am     |    1 -
 lib/engine/components/kab/Makefile.am           |    1 -
 lib/engine/components/kde/Makefile.am           |    1 -
 lib/engine/components/loudmouth/Makefile.am     |    1 -
 lib/engine/components/resource-list/Makefile.am |    1 -
 lib/engine/components/xcap/Makefile.am          |    1 -
 lib/engine/framework/Makefile.am                |    4 +-
 lib/engine/hal/Makefile.am                      |    4 +-
 lib/engine/notification/Makefile.am             |    4 +-
 lib/engine/plugin/Makefile.am                   |    9 ++++---
 lib/engine/presence/Makefile.am                 |    4 +-
 lib/engine/protocol/Makefile.am                 |    4 +-
 lib/engine/videoinput/Makefile.am               |    4 +-
 lib/engine/videooutput/Makefile.am              |    4 +-
 21 files changed, 54 insertions(+), 40 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 66dde56..c33ad87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,8 @@ dnl ###########################################################################
 
 PKG_PROG_PKG_CONFIG
 
-AM_PROG_LIBTOOL
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
 
 AC_PROG_CC_C99
 AC_PROG_CXX
@@ -821,11 +822,30 @@ dnl ###########################################################################
 dnl  Plugin support
 dnl ###########################################################################
 
-PLUGINS_LIBTOOL_FLAGS="-module -avoid-version -shared --no-undefined"
-AC_SUBST(PLUGINS_LIBTOOL_FLAGS)
+case "$host" in
+*-mingw*)
+        # libtool really installs in ../bin, so we have to add the dummy!
+        # and we have to set PLUGIN_DIR to that directory
+        bindir='${exec_prefix}'
+        stacklibdir='${exec_prefix}'
+        plugindir='${exec_prefix}/plugins'
+        PLUGIN_LIBTOOL_FLAGS="-no-undefined -avoid-version -module"
+        PLUGIN_DIR='plugins'
+        ;;
+*)
+        versioned_libdir='${libdir}/AC_PACKAGE_NAME/AC_PACKAGE_VERSION'
+        stacklibdir=${versioned_libdir}
+        plugindir=${versioned_libdir}/plugins
+        PLUGIN_LIBTOOL_FLAGS="-module"
+        PLUGIN_DIR='${plugindir}'
+        ;;
+esac
 
-PLUGINDIR='${libdir}/ekiga/plugins'
-AC_SUBST(PLUGINDIR)
+AC_SUBST(bindir)
+AC_SUBST(stacklibdir)
+AC_SUBST(plugindir)
+AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+AC_SUBST(PLUGIN_DIR)
 
 dnl ###########################################################################
 dnl  Output the different Makefiles
diff --git a/lib/engine/account/Makefile.am b/lib/engine/account/Makefile.am
index d256d96..9fe877c 100644
--- a/lib/engine/account/Makefile.am
+++ b/lib/engine/account/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libaccount.la
+stacklib_LTLIBRARIES = libaccount.la
 
 account_dir = $(top_srcdir)/lib/engine/account
 
@@ -15,4 +15,4 @@ libaccount_la_SOURCES = \
 	$(account_dir)/account-core.h			\
 	$(account_dir)/account-core.cpp
 
-libaccount_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libaccount_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/addressbook/Makefile.am b/lib/engine/addressbook/Makefile.am
index e88d5a3..c18f105 100644
--- a/lib/engine/addressbook/Makefile.am
+++ b/lib/engine/addressbook/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmaddressbook.la
+stacklib_LTLIBRARIES = libgmaddressbook.la
 
 addressbook_dir = $(top_srcdir)/lib/engine/addressbook
 
@@ -16,4 +16,4 @@ libgmaddressbook_la_SOURCES = \
 	$(addressbook_dir)/contact-core.h		\
 	$(addressbook_dir)/contact-core.cpp
 
-libgmaddressbook_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaddressbook_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/audioinput/Makefile.am b/lib/engine/audioinput/Makefile.am
index 794a545..6ea3544 100644
--- a/lib/engine/audioinput/Makefile.am
+++ b/lib/engine/audioinput/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmaudioinput.la
+stacklib_LTLIBRARIES = libgmaudioinput.la
 
 audioinput_dir = $(top_srcdir)/lib/engine/audioinput
 
@@ -19,4 +19,4 @@ libgmaudioinput_la_SOURCES = \
 	$(audioinput_dir)/audioinput-gmconf-bridge.h \
 	$(audioinput_dir)/audioinput-gmconf-bridge.cpp
 
-libgmaudioinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmaudioinput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/audiooutput/Makefile.am b/lib/engine/audiooutput/Makefile.am
index ae1e081..68e9f51 100644
--- a/lib/engine/audiooutput/Makefile.am
+++ b/lib/engine/audiooutput/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmaudiooutput.la
+stacklib_LTLIBRARIES = libgmaudiooutput.la
 
 audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput
 
@@ -21,4 +21,4 @@ libgmaudiooutput_la_SOURCES = \
 	$(audiooutput_dir)/audiooutput-gmconf-bridge.h \
 	$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
 
-libgmaudiooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmaudiooutput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/chat/Makefile.am b/lib/engine/chat/Makefile.am
index 552bf0b..505e929 100644
--- a/lib/engine/chat/Makefile.am
+++ b/lib/engine/chat/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmchat.la
+stacklib_LTLIBRARIES = libgmchat.la
 
 chat_dir = $(top_srcdir)/lib/engine/chat
 
@@ -17,4 +17,4 @@ libgmchat_la_SOURCES = \
 	$(chat_dir)/chat-simple.h		\
 	$(chat_dir)/chat-multiple.h
 
-libgmchat_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)
+libgmchat_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS)
diff --git a/lib/engine/components/evolution/Makefile.am b/lib/engine/components/evolution/Makefile.am
index e78cd1f..1d511c0 100644
--- a/lib/engine/components/evolution/Makefile.am
+++ b/lib/engine/components/evolution/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)
 plugin_LTLIBRARIES = libgmevolution.la
 
 evolution_dir = $(top_srcdir)/lib/engine/components/evolution
diff --git a/lib/engine/components/gstreamer/Makefile.am b/lib/engine/components/gstreamer/Makefile.am
index 4c403f1..3710132 100644
--- a/lib/engine/components/gstreamer/Makefile.am
+++ b/lib/engine/components/gstreamer/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)
 plugin_LTLIBRARIES = libgmgstreamer.la
 
 gstreamer_dir = $(top_srcdir)/lib/engine/components/gstreamer/
diff --git a/lib/engine/components/kab/Makefile.am b/lib/engine/components/kab/Makefile.am
index f26679c..19a0d0b 100644
--- a/lib/engine/components/kab/Makefile.am
+++ b/lib/engine/components/kab/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)/kde
 plugin_LTLIBRARIES = libgmkab.la
 
 kab_dir = $(top_srcdir)/lib/engine/components/kab
diff --git a/lib/engine/components/kde/Makefile.am b/lib/engine/components/kde/Makefile.am
index e083044..d20c9f3 100644
--- a/lib/engine/components/kde/Makefile.am
+++ b/lib/engine/components/kde/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)/kde
 plugin_LTLIBRARIES = libgmkde.la
 
 kde_dir = $(top_srcdir)/lib/engine/components/kde
diff --git a/lib/engine/components/loudmouth/Makefile.am b/lib/engine/components/loudmouth/Makefile.am
index c5c78b3..bf627fd 100644
--- a/lib/engine/components/loudmouth/Makefile.am
+++ b/lib/engine/components/loudmouth/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)
 plugin_LTLIBRARIES = libgmloudmouth.la
 
 loudmouth_dir = $(top_srcdir)/lib/engine/components/loudmouth
diff --git a/lib/engine/components/resource-list/Makefile.am b/lib/engine/components/resource-list/Makefile.am
index cb95f18..44dc52e 100644
--- a/lib/engine/components/resource-list/Makefile.am
+++ b/lib/engine/components/resource-list/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)
 plugin_LTLIBRARIES = libgmresource_list.la
 
 resource_list_dir = $(top_srcdir)/lib/engine/components/resource-list/
diff --git a/lib/engine/components/xcap/Makefile.am b/lib/engine/components/xcap/Makefile.am
index 3b33eb0..ee4d326 100644
--- a/lib/engine/components/xcap/Makefile.am
+++ b/lib/engine/components/xcap/Makefile.am
@@ -1,4 +1,3 @@
-plugindir = $(PLUGINDIR)
 plugin_LTLIBRARIES = libgmxcap.la
 
 xcap_dir = $(top_srcdir)/lib/engine/components/xcap/
diff --git a/lib/engine/framework/Makefile.am b/lib/engine/framework/Makefile.am
index 9ff3751..e88449f 100644
--- a/lib/engine/framework/Makefile.am
+++ b/lib/engine/framework/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmframework.la
+stacklib_LTLIBRARIES = libgmframework.la
 
 framework_dir = $(top_srcdir)/lib/engine/framework
 
@@ -49,4 +49,4 @@ libgmframework_la_SOURCES = \
 	$(framework_dir)/ptr_array_const_iterator.h
 
 
-libgmframework_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+libgmframework_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/hal/Makefile.am b/lib/engine/hal/Makefile.am
index c21423f..c5303f4 100644
--- a/lib/engine/hal/Makefile.am
+++ b/lib/engine/hal/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmhal.la
+stacklib_LTLIBRARIES = libgmhal.la
 
 hal_dir = $(top_srcdir)/lib/engine/hal
 
@@ -13,4 +13,4 @@ libgmhal_la_SOURCES = \
 	$(hal_dir)/hal-core.h		\
 	$(hal_dir)/hal-core.cpp
 
-libgmhal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)
+libgmhal_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS)
diff --git a/lib/engine/notification/Makefile.am b/lib/engine/notification/Makefile.am
index 9174186..5762b04 100644
--- a/lib/engine/notification/Makefile.am
+++ b/lib/engine/notification/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libnotification.la
+stacklib_LTLIBRARIES = libnotification.la
 
 notification_dir = $(top_srcdir)/lib/engine/notification
 
@@ -12,4 +12,4 @@ libnotification_la_SOURCES = \
 	$(notification_dir)/notification-core.h \
 	$(notification_dir)/notification-dummy.cpp
 
-libnotification_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libnotification_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/plugin/Makefile.am b/lib/engine/plugin/Makefile.am
index e6d8cf1..c083d1e 100644
--- a/lib/engine/plugin/Makefile.am
+++ b/lib/engine/plugin/Makefile.am
@@ -1,11 +1,12 @@
-noinst_LTLIBRARIES = libplugin.la
+stacklib_LTLIBRARIES = libplugin.la
 
 plugin_dir = $(top_srcdir)/lib/engine/plugin
 
-AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = \
+	-DEKIGA_PLUGIN_DIR=\"$(PLUGIN_DIR)\" \
+	$(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
-	-DEKIGA_PLUGIN_DIR=\"$(PLUGINDIR)\"		\
 	-I$(top_srcdir)/lib/gmconf	 		\
 	-I$(top_srcdir)/lib/engine/framework
 
@@ -13,5 +14,5 @@ libplugin_la_SOURCES = \
 	$(plugin_dir)/plugin-core.h			\
 	$(plugin_dir)/plugin-core.cpp
 
-libplugin_la_LDFLAGS = -export-dynamic -no-undefined
+libplugin_la_LDFLAGS = -shared -module -no-undefined
 libplugin_la_LIBADD = $(SIGC_LIBS) $(GLIB_LIBS)
\ No newline at end of file
diff --git a/lib/engine/presence/Makefile.am b/lib/engine/presence/Makefile.am
index 9fed87e..f4a6818 100644
--- a/lib/engine/presence/Makefile.am
+++ b/lib/engine/presence/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmpresence.la
+stacklib_LTLIBRARIES = libgmpresence.la
 
 presence_dir = $(top_srcdir)/lib/engine/presence
 
@@ -22,4 +22,4 @@ libgmpresence_la_SOURCES = \
 	$(presence_dir)/presence-core.h		\
 	$(presence_dir)/presence-core.cpp
 
-libgmpresence_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)
+libgmpresence_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS)
diff --git a/lib/engine/protocol/Makefile.am b/lib/engine/protocol/Makefile.am
index 63f1a8c..91134ad 100644
--- a/lib/engine/protocol/Makefile.am
+++ b/lib/engine/protocol/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmprotocol.la
+stacklib_LTLIBRARIES = libgmprotocol.la
 
 protocol_dir = $(top_srcdir)/lib/engine/protocol/
 
@@ -17,4 +17,4 @@ libgmprotocol_la_SOURCES = \
 	$(protocol_dir)/codec-description.h		\
 	$(protocol_dir)/codec-description.cpp
 
-libgmprotocol_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmprotocol_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/videoinput/Makefile.am b/lib/engine/videoinput/Makefile.am
index b5d4d32..db091fe 100644
--- a/lib/engine/videoinput/Makefile.am
+++ b/lib/engine/videoinput/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmvideoinput.la
+stacklib_LTLIBRARIES = libgmvideoinput.la
 
 videoinput_dir = $(top_srcdir)/lib/engine/videoinput
 
@@ -19,4 +19,4 @@ libgmvideoinput_la_SOURCES = \
 	$(videoinput_dir)/videoinput-gmconf-bridge.h \
 	$(videoinput_dir)/videoinput-gmconf-bridge.cpp
 
-libgmvideoinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_CFLAGS)
+libgmvideoinput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_CFLAGS)
diff --git a/lib/engine/videooutput/Makefile.am b/lib/engine/videooutput/Makefile.am
index d8f18b3..8fbe755 100644
--- a/lib/engine/videooutput/Makefile.am
+++ b/lib/engine/videooutput/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmvideooutput.la
+stacklib_LTLIBRARIES = libgmvideooutput.la
 
 videooutput_dir = $(top_srcdir)/lib/engine/videooutput
 
@@ -17,4 +17,4 @@ libgmvideooutput_la_SOURCES = \
 	$(videooutput_dir)/videooutput-gmconf-bridge.h  \
 	$(videooutput_dir)/videooutput-gmconf-bridge.cpp
 
-libgmvideooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmvideooutput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]