[ekiga] Split again ekiga into a library and an executable

[Julien Puydt <jpuydt src gnome org>]

commit 98df38e957608242f2571f63975bd151c97a3ff8
Author: Julien Puydt <jpuydt gnome org>
Date:   Wed Oct 7 09:27:12 2009 +0200

    Split again ekiga into a library and an executable
    
    Thanks Michael Rickmann

 configure.ac                  |    4 ++--
 lib/Makefile.am               |    6 ++++--
 plugins/ldap/Makefile.am      |    1 +
 plugins/loudmouth/Makefile.am |    4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ec93214..0e6e368 100644
--- a/configure.ac
+++ b/configure.ac
@@ -855,13 +855,13 @@ case "$host" in
         ;;
 esac
 
-PLUGIN_LIBTOOL_FLAGS="-no-undefined -avoid-version -module"
+PLUGINS_LIBTOOL_FLAGS="-no-undefined -avoid-version -module"
 STACKLIB_LDFLAGS='-shared -module -no-undefined -avoid-version'
 
 AC_SUBST(bindir)
 AC_SUBST(stacklibdir)
 AC_SUBST(plugindir)
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+AC_SUBST(PLUGINS_LIBTOOL_FLAGS)
 AC_SUBST(PLUGIN_DIR)
 AC_SUBST(STACKLIB_LDFLAGS)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ce696b4..254ae8f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,9 @@
-noinst_LTLIBRARIES = libekiga.la
+stacklib_LTLIBRARIES = libekiga.la
+stacklib_dir = $(stacklibdir)
 
 libekiga_la_SOURCES =
-libekiga_la_LDFLAGS = -export-dynamic
+libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
+
 
 CLEANFILES =
 
diff --git a/plugins/ldap/Makefile.am b/plugins/ldap/Makefile.am
index 21b4f44..693315b 100644
--- a/plugins/ldap/Makefile.am
+++ b/plugins/ldap/Makefile.am
@@ -21,4 +21,5 @@ libgmldap_la_SOURCES = \
 
 libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmldap_la_LIBADD = \
+	$(top_builddir)/lib/libekiga.la \
 	$(LDAP_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/plugins/loudmouth/Makefile.am b/plugins/loudmouth/Makefile.am
index 422fe2a..82425ae 100644
--- a/plugins/loudmouth/Makefile.am
+++ b/plugins/loudmouth/Makefile.am
@@ -30,4 +30,6 @@ libgmloudmouth_la_SOURCES = \
 	$(loudmouth_dir)/loudmouth-dialect.cpp
 
 libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
-libgmloudmouth_la_LIBADD = $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file
+libgmloudmouth_la_LIBADD = \
+	$(top_builddir)/lib/libekiga.la \
+	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file