[ekiga] Made the loudmouth code a plugin (bug #586265)

[Julien Puydt <jpuydt src gnome org>]

commit 8d76d021dad715053b44ed9110341f2332a439c8
Author: Julien Puydt <jpuydt gnome org>
Date:   Fri Jun 19 15:26:27 2009 +0200

    Made the loudmouth code a plugin (bug #586265)

 lib/engine/Makefile.am                             |    5 -----
 lib/engine/components/loudmouth/Makefile.am        |    6 ++++--
 lib/engine/components/loudmouth/loudmouth-main.cpp |    4 ++--
 lib/engine/engine.cpp                              |    8 --------
 4 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/lib/engine/Makefile.am b/lib/engine/Makefile.am
index 6e6b0d1..cf0ce6c 100644
--- a/lib/engine/Makefile.am
+++ b/lib/engine/Makefile.am
@@ -153,11 +153,6 @@ INCLUDES += -I$(top_srcdir)/lib/engine/components/libnotify/
 libekiga_engine_la_LIBADD += components/libnotify/libgmlibnotify.la
 endif
 
-
-if HAVE_LOUDMOUTH
-libekiga_engine_la_LIBADD += components/loudmouth/libgmloudmouth.la
-endif
-
 #### FIXME should be removed at a later stage
 INCLUDES += \
 	-I$(top_srcdir)/lib/gui/	                \
diff --git a/lib/engine/components/loudmouth/Makefile.am b/lib/engine/components/loudmouth/Makefile.am
index f6ba8b8..c5c78b3 100644
--- a/lib/engine/components/loudmouth/Makefile.am
+++ b/lib/engine/components/loudmouth/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libgmloudmouth.la
+plugindir = $(PLUGINDIR)
+plugin_LTLIBRARIES = libgmloudmouth.la
 
 loudmouth_dir = $(top_srcdir)/lib/engine/components/loudmouth
 
@@ -29,4 +30,5 @@ libgmloudmouth_la_SOURCES = \
 	$(loudmouth_dir)/loudmouth-dialect.h \
 	$(loudmouth_dir)/loudmouth-dialect.cpp
 
-libgmloudmouth_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file
+libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
+libgmloudmouth_la_LIBADD = $(SIGC_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/loudmouth/loudmouth-main.cpp b/lib/engine/components/loudmouth/loudmouth-main.cpp
index d95ff45..dd52882 100644
--- a/lib/engine/components/loudmouth/loudmouth-main.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-main.cpp
@@ -84,8 +84,8 @@ struct LOUDMOUTHSpark: public Ekiga::Spark
   bool result;
 };
 
-void
-loudmouth_init (Ekiga::KickStart& kickstart)
+extern "C" void
+ekiga_plugin_init (Ekiga::KickStart& kickstart)
 {
   gmref_ptr<Ekiga::Spark> spark(new LOUDMOUTHSpark);
   kickstart.add_spark (spark);
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index d06fdf2..c98b70e 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -99,10 +99,6 @@
 #include "libnotify-main.h"
 #endif
 
-#ifdef HAVE_LOUDMOUTH
-#include "loudmouth-main.h"
-#endif
-
 #define DEBUG_STARTUP 0
 
 #if DEBUG_STARTUP
@@ -237,10 +233,6 @@ engine_init (int argc,
 
   local_roster_bridge_init (kickstart);
 
-#ifdef HAVE_LOUDMOUTH
-  loudmouth_init (kickstart);
-#endif
-
   plugin_init (kickstart);
 
   kickstart.kick (*service_core, &argc, &argv);