Updating branch refs/heads/master
to cb916736731da50ee3c8bdf5087e708d3f4e5841 (commit)
from 32741dd842130cbf3f31bc3b57c4eae4d3ff8689 (commit)
commit cb916736731da50ee3c8bdf5087e708d3f4e5841
Author: Enrico Tröger <enrico.troe...@uvena.de>
Date: Sat May 5 00:06:24 2012 +0200
Renew build system and build panel plugin as library
autogen.sh | 2 +-
configure.ac.in | 87 ++++++++++++--------
panel-plugin/Makefile.am | 38 ++++-----
panel-plugin/xfce4-dict-plugin.c | 2 +-
....desktop.in.in => xfce4-dict-plugin.desktop.in} | 4 +-
5 files changed, 75 insertions(+), 58 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 5564b30..ed264be 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@
# Written for Xfce by Benedikt Meurer <be...@xfce.org>.
#
-XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+XDT_AUTOGEN_REQUIRED_VERSION="4.9.0"
export XDT_AUTOGEN_REQUIRED_VERSION
(type xdt-autogen) >/dev/null 2>&1 || {
diff --git a/configure.ac.in b/configure.ac.in
index baec65c..a9162ba 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,37 +1,57 @@
-dnl configure.ac.in
-dnl
-dnl xfce4-dict
-dnl
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([xfce4_dict_version_major], [0])
+m4_define([xfce4_dict_version_minor], [6])
+m4_define([xfce4_dict_version_micro], [0])
+m4_define([xfce4_dict_version_build], [r@REVISION@])
+m4_define([xfce4_dict_version_tag], [])
+m4_define([xfce4_dict_version],
[xfce4_dict_version_major().xfce4_dict_version_minor().xfce4_dict_version_micro()ifelse(xfce4_dict_version_tag(),
[git], [xfce4_dict_version_tag()-xfce4_dict_version_build()],
[xfce4_dict_version_tag()])])
-dnl version info
-m4_define([dict_version], [0.6.0])
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2012 Enrico Tröger. All rights reserved.])
+AC_INIT([xfce4-dict-plugin], [xfce4_dict_version],
[http://bugzilla.xfce.org/], [xfce4-dict-plugin])
+AC_PREREQ([2.50])
-dnl init autoconf
-AC_INIT([xfce4-dict], [dict_version], [http://bugzilla.xfce.org/])
-AC_PREREQ([2.53])
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl init automake
-DICT_VERSION=dict_version
-AM_INIT_AUTOMAKE([xfce4-dict], [$DICT_VERSION])
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-dnl check for basic programs
-AC_PROG_CC
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL
+AC_PROG_LD()
+AC_PROG_INSTALL()
+AC_PROG_INTLTOOL()
-dnl check for standard header files
-AC_HEADER_STDC
+dnl ***************************
+dnl *** Disable static libs ***
+dnl ***************************
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
-dnl check for i18n support
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
+AC_SEARCH_LIBS(floor, m)
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
XDT_I18N([@LINGUAS@])
-dnl check for required packages
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0])
@@ -39,15 +59,16 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
[4.4.0.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0])
XDT_CHECK_PACKAGE([X11], [x11])
-AC_SEARCH_LIBS(floor, m)
-
-dnl check for debugging support
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
XDT_FEATURE_DEBUG()
+
AC_OUTPUT([
-Makefile
-lib/Makefile
-panel-plugin/Makefile
-src/Makefile
-po/Makefile.in
+ Makefile
+ lib/Makefile
+ panel-plugin/Makefile
+ src/Makefile
+ po/Makefile.in
])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 9b83fc9..02d6315 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,19 +1,21 @@
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-dict-plugin
+plugindir = $(libdir)/xfce4/panel/plugins
+plugin_LTLIBRARIES = libxfce4dict.la
-xfce4_dict_plugin_SOURCES = \
+
+libxfce4dict_la_SOURCES = \
xfce4-dict-plugin.c
-xfce4_dict_plugin_CFLAGS = \
+libxfce4dict_la_CFLAGS = \
-I$(top_srcdir)
\
-I$(top_srcdir)/lib
\
$(LIBXFCEGUI4_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
+ -DG_LOG_DOMAIN=\"xfce4-dict-plugin\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@GTHREAD_CFLAGS@
-xfce4_dict_plugin_LDADD = \
+libxfce4dict_la_LIBADD = \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCEGUI4_LIBS)
\
@GTHREAD_LIBS@
\
@@ -21,27 +23,19 @@ xfce4_dict_plugin_LDADD =
\
$(top_builddir)/lib/libdict.la
-# .desktop file
#
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
+# Desktop file
#
-desktop_in_in_files = xfce4-dict-plugin.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktopdir = \
+ $(datadir)/xfce4/panel/plugins
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+desktop_DATA = \
+ xfce4-dict-plugin.desktop
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
- $< > $@
+@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_in_files)
+ xfce4-dict-plugin.desktop.in
-DISTCLEANFILES = \
- $(desktop_DATA) $(desktop_in_files)
+CLEANFILES = \
+ $(desktop_DATA)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 7b56501..4f6fb30 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -491,4 +491,4 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
dict_gui_status_add(dpd->dd, _("Ready"));
}
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(dict_plugin_construct);
+XFCE_PANEL_PLUGIN_REGISTER(dict_plugin_construct);
diff --git a/panel-plugin/xfce4-dict-plugin.desktop.in.in
b/panel-plugin/xfce4-dict-plugin.desktop.in
similarity index 74%
copy from panel-plugin/xfce4-dict-plugin.desktop.in.in
copy to panel-plugin/xfce4-dict-plugin.desktop.in
index 75a9433..4965a14 100644
--- a/panel-plugin/xfce4-dict-plugin.desktop.in.in
+++ b/panel-plugin/xfce4-dict-plugin.desktop.in
@@ -4,4 +4,6 @@ Encoding=UTF-8
_Name=Dictionary
_Comment=A plugin to query different dictionaries.
Icon=xfce4-dict
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-dict-plugin
+X-XFCE-Module=xfce4dict
+X-XFCE-Internal=false
+
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
