[Xfce4-commits] <xfce4-systemload-plugin:master> Compiling the plugin as a module.

[David Schneider]

Updating branch refs/heads/master
         to d065ef4b8d4e8d6fe69c5a64b7539a78484d77a6 (commit)
       from a423d175072f4851ebfb6263d1796014b151fec4 (commit)

commit d065ef4b8d4e8d6fe69c5a64b7539a78484d77a6
Author: David Schneider <dnschneid at gmail.com>
Date:   Tue Feb 14 23:53:06 2012 -0800

    Compiling the plugin as a module.

 .gitignore                            |    6 ++++--
 panel-plugin/Makefile.am              |   19 +++++++++++++------
 panel-plugin/systemload.c             |    2 +-
 panel-plugin/systemload.desktop.in.in |    3 ++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 892a6af..69c40e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
-*.o
+*.la
+*.lo
 .deps/
+.libs/
 INSTALL
 Makefile
 Makefile.in
@@ -18,7 +20,7 @@ ltmain.sh
 missing
 mkinstalldirs
 panel-plugin/systemload.desktop
-panel-plugin/xfce4-systemload-plugin
+panel-plugin/systemload.desktop.in
 po/*.gmo
 po/.intltool-merge-cache
 po/stamp-it
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 9396445..c588600 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -7,10 +7,10 @@ INCLUDES =								\
 plugindir =								\
 	$(libdir)/xfce4/panel/plugins
 	
-plugin_PROGRAMS =							\
-	xfce4-systemload-plugin
+plugin_LTLIBRARIES =							\
+	libsystemload.la
 
-xfce4_systemload_plugin_SOURCES =					\
+libsystemload_la_SOURCES =					\
 	systemload.c							\
 	uptime.c							\
 	uptime.h							\
@@ -19,7 +19,7 @@ xfce4_systemload_plugin_SOURCES =					\
 	cpu.c								\
 	cpu.h
 
-xfce4_systemload_plugin_CFLAGS =					\
+libsystemload_la_CFLAGS =					\
 	$(GTK_CFLAGS)							\
 	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(LIBXFCE4UI_CFLAGS)						\
@@ -27,7 +27,14 @@ xfce4_systemload_plugin_CFLAGS =					\
 	$(UPOWER_GLIB_CFLAGS)						\
 	$(PLATFORM_CFLAGS)
 
-xfce4_systemload_plugin_LDADD =						\
+libsystemload_la_LDFLAGS = \
+	-avoid-version \
+	-module \
+	-no-undefined \
+	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+	$(PLATFORM_LDFLAGS)
+
+libsystemload_la_LIBADD =						\
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(LIBXFCE4UI_LIBS)						\
 	$(LIBXFCE4PANEL_LIBS) 						\
@@ -45,7 +52,7 @@ desktop_in_in_files =							\
 desktop_in_files =							\
 	$(desktop_in_in_files:.desktop.in.in=.desktop.in)
 
-%.desktop.in: %.desktop.in.in
+$(desktop_in_files): $(desktop_in_in_files)
 	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
 
 desktop_DATA =								\
diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
index c24f041..c1acfd5 100644
--- a/panel-plugin/systemload.c
+++ b/panel-plugin/systemload.c
@@ -919,5 +919,5 @@ systemload_construct (XfcePanelPlugin *plugin)
                       G_CALLBACK (monitor_create_options), global);
 }
 
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (systemload_construct);
+XFCE_PANEL_PLUGIN_REGISTER (systemload_construct);
 
diff --git a/panel-plugin/systemload.desktop.in.in b/panel-plugin/systemload.desktop.in.in
index 74d4bfa..5daab14 100644
--- a/panel-plugin/systemload.desktop.in.in
+++ b/panel-plugin/systemload.desktop.in.in
@@ -4,5 +4,6 @@ Encoding=UTF-8
 _Name=System Load Monitor
 _Comment=Monitor CPU load, swap usage and memory footprint
 Icon=utilities-system-monitor
-X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-systemload-plugin
+X-XFCE-Module=systemload
+X-XFCE-Internal=false