[Xfce4-commits] <xfce4-eyes-plugin:master> Build the plugin as a module.
Harald Judt
noreply at xfce.org
Wed Feb 27 19:44:05 CET 2013
Updating branch refs/heads/master
to 64c5b6460a7efddf2a1829be72430b9dddca1456 (commit)
from eba51dfe7955f9d344d966269ab01ea16f82c38a (commit)
commit 64c5b6460a7efddf2a1829be72430b9dddca1456
Author: Harald Judt <h.judt at gmx.at>
Date: Tue Feb 26 21:06:46 2013 +0100
Build the plugin as a module.
Makefile.am | 3 +
panel-plugin/Makefile.am | 41 ++++++++++----------
panel-plugin/eyes.c | 2 +-
.../{eyes.desktop.in.in => eyes.desktop.in} | 3 +-
po/POTFILES.in | 2 +-
5 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 43e16a9..f6ad55c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,9 @@ SUBDIRS = \
distclean-local:
rm -rf *.spec *.cache *~
+distuninstallcheck_listfiles = \
+ find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+
rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index f2d3c14..90dae66 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,38 +1,39 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\"
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-eyes-plugin
+plugindir = $(libdir)/xfce4/panel/plugins
+plugin_LTLIBRARIES = libeyes.la
-xfce4_eyes_plugin_SOURCES = \
+libeyes_la_SOURCES = \
eyes.h \
eyes.c \
themes.h \
themes.c
-xfce4_eyes_plugin_CFLAGS = \
- $(LIBXFCE4UI_CFLAGS) \
+libeyes_la_CFLAGS = \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS)
-xfce4_eyes_plugin_LDADD = \
- $(LIBXFCE4PANEL_LIBS) \
+libeyes_la_LIBADD = \
+ $(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UI_LIBS)
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = eyes.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
- sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+libeyes_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
+
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_in_files = eyes.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
+EXTRA_DIST = $(desktop_in_files)
-CLEANFILES = \
- $(desktop_in_files) \
- $(desktop_DATA)
+CLEANFILES = $(desktop_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c
index b1c06af..a6be752 100644
--- a/panel-plugin/eyes.c
+++ b/panel-plugin/eyes.c
@@ -548,4 +548,4 @@ eyes_construct (XfcePanelPlugin *plugin)
xfce_panel_plugin_add_action_widget (plugin, eyes->ebox);
}
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (eyes_construct);
+XFCE_PANEL_PLUGIN_REGISTER (eyes_construct)
diff --git a/panel-plugin/eyes.desktop.in.in b/panel-plugin/eyes.desktop.in
similarity index 63%
rename from panel-plugin/eyes.desktop.in.in
rename to panel-plugin/eyes.desktop.in
index d00e9ad..b8d58fb 100644
--- a/panel-plugin/eyes.desktop.in.in
+++ b/panel-plugin/eyes.desktop.in
@@ -4,4 +4,5 @@ Encoding=UTF-8
_Name=Eyes
_Comment=Eyes that spy on you
Icon=xfce4-eyes
-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-eyes-plugin
+X-XFCE-Internal=FALSE
+X-XFCE-Module=eyes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b5c7704..bae2045 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
panel-plugin/eyes.c
panel-plugin/themes.c
-panel-plugin/eyes.desktop.in.in
+panel-plugin/eyes.desktop.in
More information about the Xfce4-commits
mailing list