[ekiga] Turned the KDE and KAB code into plugins (bug #586266 and bug #586267)
- From: Julien Puydt <jpuydt src gnome org>
- To: svn-commits-list gnome org
- Subject: [ekiga] Turned the KDE and KAB code into plugins (bug #586266 and bug #586267)
- Date: Thu, 18 Jun 2009 15:53:26 -0400 (EDT)
commit a9687f7c0a73aa24a9a3e220b28822a08251659f
Author: Julien Puydt <jpuydt gnome org>
Date: Thu Jun 18 21:52:46 2009 +0200
Turned the KDE and KAB code into plugins (bug #586266 and bug #586267)
That was so much easier than I thought...
lib/engine/components/kab/Makefile.am | 13 +++++--------
lib/engine/components/kab/kab-main.cpp | 4 ++--
lib/engine/components/kde/Makefile.am | 10 ++++++----
lib/engine/components/kde/kde-main.cpp | 4 ++--
4 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/lib/engine/components/kab/Makefile.am b/lib/engine/components/kab/Makefile.am
index 328eb12..f26679c 100644
--- a/lib/engine/components/kab/Makefile.am
+++ b/lib/engine/components/kab/Makefile.am
@@ -1,8 +1,5 @@
-if WIN32
-lib_LTLIBRARIES = libgmkab.la
-else
-noinst_LTLIBRARIES = libgmkab.la
-endif
+plugindir = $(PLUGINDIR)/kde
+plugin_LTLIBRARIES = libgmkab.la
kab_dir = $(top_srcdir)/lib/engine/components/kab
@@ -22,7 +19,7 @@ libgmkab_la_SOURCES = \
$(kab_dir)/kab-main.h \
$(kab_dir)/kab-main.cpp
+libgmkab_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
libgmkab_la_LIBADD = \
- $(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
-
-libgmkab_la_LDFLAGS = -export-dynamic -no-undefined $(KAB_LIBS)
+ $(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
+ $(KAB_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/kab/kab-main.cpp b/lib/engine/components/kab/kab-main.cpp
index 984e6cf..c7fd71c 100644
--- a/lib/engine/components/kab/kab-main.cpp
+++ b/lib/engine/components/kab/kab-main.cpp
@@ -72,8 +72,8 @@ struct KABSpark: public Ekiga::Spark
};
-void
-kab_init (Ekiga::KickStart& kickstart)
+extern "C" void
+ekiga_plugin_init (Ekiga::KickStart& kickstart)
{
gmref_ptr<Ekiga::Spark> spark(new KABSpark);
kickstart.add_spark (spark);
diff --git a/lib/engine/components/kde/Makefile.am b/lib/engine/components/kde/Makefile.am
index 0f24162..e083044 100644
--- a/lib/engine/components/kde/Makefile.am
+++ b/lib/engine/components/kde/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libgmkde.la
+plugindir = $(PLUGINDIR)/kde
+plugin_LTLIBRARIES = libgmkde.la
kde_dir = $(top_srcdir)/lib/engine/components/kde
@@ -11,6 +12,7 @@ libgmkde_la_SOURCES = \
$(kde_dir)/kde-main.h \
$(kde_dir)/kde-main.cpp
-libgmkde_la_LIBADD = $(top_builddir)/lib/engine/framework/libgmframework.la
-
-libgmkde_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(KDE_LIBS)
\ No newline at end of file
+libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
+libgmkde_la_LIBADD = \
+ $(top_builddir)/lib/engine/framework/libgmframework.la \
+ $(SIGC_LIBS) $(KDE_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/kde/kde-main.cpp b/lib/engine/components/kde/kde-main.cpp
index 18a4c60..15d036e 100644
--- a/lib/engine/components/kde/kde-main.cpp
+++ b/lib/engine/components/kde/kde-main.cpp
@@ -83,8 +83,8 @@ struct KDESpark: public Ekiga::Spark
};
-void
-kde_init (Ekiga::KickStart& kickstart)
+extern "C" void
+ekiga_plugin_init (Ekiga::KickStart& kickstart)
{
gmref_ptr<Ekiga::Spark> spark(new KDESpark);
kickstart.add_spark (spark);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]