[Xfce4-commits] <xfce4-panel:devel> Move file locations around and bump library api to 2.
Nick Schermer
noreply at xfce.org
Tue Nov 17 14:18:01 CET 2009
Updating branch refs/heads/devel
to ad3303a3a7ff5621dc739c0053f42135f2a5c916 (commit)
from d7c4109257039530be70398529a514d1b97d4398 (commit)
commit ad3303a3a7ff5621dc739c0053f42135f2a5c916
Author: Nick Schermer <nick at xfce.org>
Date: Tue Nov 17 13:04:28 2009 +0100
Move file locations around and bump library api to 2.
Remove unneeded INCLUDES from makefiles.
Move the libexec executables to $(libexecdir)/xfce4/panel/.
Bump the library ABI version to -2, people need to make changes
to the build files for their plugins, so better do it the
right way from the beginning.
Move plugin libraries to $(libdir)/xfce4/panel and desktop
files to $(datadir)/xfce4/panel. Much more consistent.
configure.in.in | 18 ++++++++--
libxfce4panel/Makefile.am | 15 ++++----
...bxfce4panel-1.0.pc.in => libxfce4panel-2.pc.in} | 4 +-
migrate/Makefile.am | 15 ++++----
panel/Makefile.am | 14 +++-----
panel/panel-application.c | 3 +-
panel/panel-module-factory.c | 9 ++---
panel/panel-plugin-external.c | 2 +-
plugins/actions/Makefile.am | 9 ++---
plugins/clock/Makefile.am | 9 ++---
plugins/launcher/Makefile.am | 12 ++----
plugins/pager/Makefile.am | 9 ++---
plugins/separator/Makefile.am | 9 ++---
plugins/showdesktop/Makefile.am | 10 ++---
plugins/systray/Makefile.am | 9 ++---
plugins/tasklist/Makefile.am | 9 ++---
plugins/windowmenu/Makefile.am | 9 ++---
wrapper/Makefile.am | 35 ++++++++-----------
18 files changed, 93 insertions(+), 107 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 334a9ec..bf30c0d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,7 +8,8 @@ dnl
dnl ***************************
dnl *** Version information ***
dnl ***************************
-m4_define([libxfce4panel_verinfo], [3:0:1])
+m4_define([libxfce4panel_verinfo], [0:0:0])
+m4_define([libxfce4panel_version_api], [2])
m4_define([xfce4_panel_version_major], [4])
m4_define([xfce4_panel_version_minor], [7])
m4_define([xfce4_panel_version_micro], [0])
@@ -70,6 +71,18 @@ dnl **************************************
LIBXFCE4PANEL_VERINFO=libxfce4panel_verinfo()
AC_SUBST([LIBXFCE4PANEL_VERINFO])
+dnl **************************
+dnl *** Substitute version ***
+dnl **************************
+LIBXFCE4PANEL_VERSION_API=libxfce4panel_version_api()
+LIBXFCE4PANEL_VERSION_MAJOR=xfce4_panel_version_major()
+LIBXFCE4PANEL_VERSION_MINOR=xfce4_panel_version_minor()
+LIBXFCE4PANEL_VERSION_MICRO=xfce4_panel_version_micro()
+AC_SUBST([LIBXFCE4PANEL_VERSION_API])
+AC_SUBST([LIBXFCE4PANEL_VERSION_MAJOR])
+AC_SUBST([LIBXFCE4PANEL_VERSION_MINOR])
+AC_SUBST([LIBXFCE4PANEL_VERSION_MICRO])
+
dnl **********************************
dnl *** Check for standard headers ***
dnl **********************************
@@ -97,7 +110,6 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.1])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.18.0])
XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73])
XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0])
@@ -169,7 +181,7 @@ AC_OUTPUT([
Makefile
common/Makefile
libxfce4panel/Makefile
-libxfce4panel/libxfce4panel-1.0.pc
+libxfce4panel/libxfce4panel-2.pc
migrate/Makefile
panel/Makefile
wrapper/Makefile
diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index 0ef2258..de0b60f 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -2,12 +2,11 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libxfce4panel\" \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DLIBXFCE4PANEL_COMPILATION \
$(PLATFORM_CPPFLAGS)
lib_LTLIBRARIES = \
- libxfce4panel.la
+ libxfce4panel-2.la
libxfce4panel_public_built_sources = \
libxfce4panel-enum-types.h
@@ -31,13 +30,13 @@ libxfce4panel_headers = \
xfce-panel-image.h
libxfce4panel_includedir = \
- $(includedir)/xfce4/libxfce4panel
+ $(includedir)/xfce4/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API)/libxfce4panel
libxfce4panel_include_HEADERS = \
$(libxfce4panel_public_built_sources) \
$(libxfce4panel_headers)
-libxfce4panel_la_SOURCES = \
+libxfce4panel_2_la_SOURCES = \
$(libxfce4panel_built_sources) \
$(libxfce4panel_headers) \
xfce-arrow-button.c \
@@ -48,19 +47,19 @@ libxfce4panel_la_SOURCES = \
xfce-panel-plugin-provider.h \
xfce-panel-image.c
-libxfce4panel_la_CFLAGS = \
+libxfce4panel_2_la_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(PLATFORM_CFLAGS)
-libxfce4panel_la_LDFLAGS = \
+libxfce4panel_2_la_LDFLAGS = \
-no-undefined \
-export-dynamic \
-version-info $(LIBXFCE4PANEL_VERINFO) \
-export-symbols-regex '^[^_].*' \
$(PLATFORM_LDFLAGS)
-libxfce4panel_la_LIBADD = \
+libxfce4panel_2_la_LIBADD = \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS)
@@ -68,7 +67,7 @@ libxfce4panel_la_LIBADD = \
# Pkg-config file
#
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfce4panel-1.0.pc
+pkgconfig_DATA = libxfce4panel-2.pc
#
# Build sources
diff --git a/libxfce4panel/libxfce4panel-1.0.pc.in b/libxfce4panel/libxfce4panel-2.pc.in
similarity index 70%
rename from libxfce4panel/libxfce4panel-1.0.pc.in
rename to libxfce4panel/libxfce4panel-2.pc.in
index 03c4798..779be28 100644
--- a/libxfce4panel/libxfce4panel-1.0.pc.in
+++ b/libxfce4panel/libxfce4panel-2.pc.in
@@ -11,5 +11,5 @@ Name: libxfce4panel
Description: Library for the Xfce Panel
Requires: gtk+-2.0 gmodule-2.0 glib-2.0 libxfce4util-1.0
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lxfce4panel
-Cflags: -I${includedir}/xfce4/
+Libs: -L${libdir} -lxfce4panel- at LIBXFCE4PANEL_VERSION_API@
+Cflags: -I${includedir}/xfce4/libxfce4panel- at LIBXFCE4PANEL_VERSION_API@
diff --git a/migrate/Makefile.am b/migrate/Makefile.am
index b0f2086..e4a0c69 100644
--- a/migrate/Makefile.am
+++ b/migrate/Makefile.am
@@ -1,7 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_builddir) \
-DG_LOG_DOMAIN=\"xfce4-panel-migrate\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDEFAULT_CONFIG=\"$(sysconfdir)/xdg/xfce4/panel/default.xml\" \
@@ -11,28 +10,30 @@ confdir = $(sysconfdir)/xdg/xfce4/panel
conf_DATA = \
default.xml
-libexec_PROGRAMS = \
- xfce4-panel-migrate
+migratedir = $(libexecdir)/xfce4/panel
-xfce4_panel_migrate_SOURCES = \
+migrate_PROGRAMS = \
+ migrate
+
+migrate_SOURCES = \
main.c \
migrate-46.c \
migrate-46.h \
migrate-default.c \
migrate-default.h
-xfce4_panel_migrate_CFLAGS = \
+migrate_CFLAGS = \
$(GTK_CFLAGS) \
$(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(PLATFORM_CFLAGS)
-xfce4_panel_migrate_LDFLAGS = \
+migrate_LDFLAGS = \
-no-undefined \
$(PLATFORM_LDFLAGS)
-xfce4_panel_migrate_LDADD = \
+migrate_LDADD = \
$(GTK_LIBS) \
$(XFCONF_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 48460df..3d07e43 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -1,12 +1,10 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_builddir) \
-DG_LOG_DOMAIN=\"xfce4-panel\" \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DDATADIR=\"$(datadir)/xfce4/panel\" \
+ -DLIBDIR=\"$(libdir)/xfce4/panel\" \
+ -DLIBEXECDIR=\"$(libexecdir)/xfce4/panel\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDBUS_API_SUBJECT_TO_CHANGE \
$(PLATFORM_CPPFLAGS)
@@ -52,7 +50,6 @@ xfce4_panel_SOURCES = \
xfce4_panel_CFLAGS = \
$(GTK_CFLAGS) \
$(GMODULE_CFLAGS) \
- $(GTHREAD_CFLAGS) \
$(EXO_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
@@ -65,19 +62,18 @@ xfce4_panel_LDFLAGS = \
$(PLATFORM_LDFLAGS)
xfce4_panel_LDADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
$(EXO_LIBS) \
$(GMODULE_LIBS) \
- $(GTHREAD_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(XFCONF_LIBS) \
$(DBUS_LIBS)
xfce4_panel_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
if MAINTAINER_MODE
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 9d09654..899c5d4 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -46,7 +46,6 @@
#include <panel/panel-plugin-external.h>
#define AUTOSAVE_INTERVAL (10 * 60)
-#define MIGRATE_COMMAND LIBEXECDIR G_DIR_SEPARATOR_S "xfce4-panel-migrate"
@@ -190,7 +189,7 @@ panel_application_init (PanelApplication *application)
/* check for any configuration */
if (!xfconf_channel_has_property (application->xfconf, "/panels"))
{
- if (!g_spawn_command_line_sync (MIGRATE_COMMAND, NULL, NULL, NULL, &error))
+ if (!g_spawn_command_line_sync (LIBEXECDIR G_DIR_SEPARATOR_S "migrate", NULL, NULL, NULL, &error))
{
xfce_dialog_show_error (NULL, error, _("Failed to launch the migration application"));
g_error_free (error);
diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c
index 0386ef8..cb619d4 100644
--- a/panel/panel-module-factory.c
+++ b/panel/panel-module-factory.c
@@ -35,9 +35,6 @@
#include <panel/panel-module.h>
#include <panel/panel-module-factory.h>
-#define DESKTOP_FILES_DIR (DATADIR G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S "panel-plugins")
-#define LIBRARY_FILES_DIR (LIBDIR G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S "panel-plugins")
-
static void panel_module_factory_finalize (GObject *object);
@@ -150,7 +147,7 @@ panel_module_factory_load_modules (PanelModuleFactory *factory)
gchar *internal_name;
/* try to open the directory */
- dir = g_dir_open (DESKTOP_FILES_DIR, 0, NULL);
+ dir = g_dir_open (DATADIR, 0, NULL);
if (G_UNLIKELY (dir == NULL))
return;
@@ -169,7 +166,7 @@ panel_module_factory_load_modules (PanelModuleFactory *factory)
continue;
/* create the full .desktop filename */
- filename = g_build_filename (DESKTOP_FILES_DIR, name, NULL);
+ filename = g_build_filename (DATADIR, name, NULL);
/* find the dot in the name, this cannot
* fail since it pasted the .desktop suffix check */
@@ -185,7 +182,7 @@ panel_module_factory_load_modules (PanelModuleFactory *factory)
/* try to load the module */
module = panel_module_new_from_desktop_file (filename,
internal_name,
- LIBRARY_FILES_DIR,
+ LIBDIR,
force_all_external);
if (G_LIKELY (module != NULL))
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index bdeacf1..3850403 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -232,7 +232,7 @@ panel_plugin_external_realize (GtkWidget *widget)
argv = g_new0 (gchar *, argc);
/* setup the basic argv */
- argv[0] = (gchar *) LIBEXECDIR "/xfce4-panel-wrapper";
+ argv[0] = (gchar *) LIBEXECDIR G_DIR_SEPARATOR_S "wrapper";
argv[1] = (gchar *) "-n";
argv[2] = (gchar *) panel_module_get_name (external->module);
argv[3] = (gchar *) "-i";
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index 7922d6e..1d9aada 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -2,10 +2,9 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libactions\" \
- -DLOCALEDIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libactions.la
@@ -34,7 +33,7 @@ libactions_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libactions_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
@@ -43,13 +42,13 @@ libactions_la_LIBADD = \
$(XFCONF_LIBS)
libactions_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = actions.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 05531b1..346da2d 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -2,10 +2,9 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libclock\" \
- -DLOCALEDIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libclock.la
@@ -45,7 +44,7 @@ libclock_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libclock_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
$(CAIRO_LIBS) \
@@ -55,13 +54,13 @@ libclock_la_LIBADD = \
$(XFCONF_LIBS)
libclock_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = clock.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index 96f9a93..7f2e33c 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -1,15 +1,11 @@
INCLUDES = \
-I$(top_srcdir) \
- -DBINDIR=\"$(bindir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
-DG_LOG_DOMAIN=\"liblauncher\" \
-DSN_API_NOT_YET_FROZEN \
- -DEXO_API_SUBJECT_TO_CHANGE \
- -DLOCALEDIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
liblauncher.la
@@ -42,7 +38,7 @@ liblauncher_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
liblauncher_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
@@ -53,13 +49,13 @@ liblauncher_la_LIBADD = \
$(XFCONF_LIBS)
liblauncher_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = launcher.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index 78e062f..8206bdf 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -2,11 +2,10 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libpager\" \
- -DLOCALEDIR=\"$(localedir)\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libpager.la
@@ -36,7 +35,7 @@ libpager_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libpager_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
@@ -46,13 +45,13 @@ libpager_la_LIBADD = \
$(XFCONF_LIBS)
libpager_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = pager.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index ffc706c..7865e42 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -2,10 +2,9 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libseparator\" \
- -DLOCALEDIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libseparator.la
@@ -35,7 +34,7 @@ libseparator_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libseparator_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
$(CAIRO_LIBS) \
@@ -45,13 +44,13 @@ libseparator_la_LIBADD = \
$(XFCONF_LIBS)
libseparator_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = separator.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/showdesktop/Makefile.am b/plugins/showdesktop/Makefile.am
index 7e58c33..5dc5a71 100644
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@@ -1,13 +1,11 @@
INCLUDES = \
-I$(top_srcdir) \
- -DBINDIR=\"$(bindir)\" \
-DG_LOG_DOMAIN=\"libshowdesktop\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
- -DLOCALEDIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libshowdesktop.la
@@ -30,18 +28,18 @@ libshowdesktop_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libshowdesktop_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBWNCK_LIBS)
libshowdesktop_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = showdesktop.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 0481f0c..73c6fd1 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -2,10 +2,9 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libsystray\" \
- -DLOCALEDIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libsystray.la
@@ -43,7 +42,7 @@ libsystray_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libsystray_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(LIBX11_LIBS) \
$(GTK_LIBS) \
@@ -53,13 +52,13 @@ libsystray_la_LIBADD = \
$(XFCONF_LIBS)
libsystray_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = systray.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index ca03e8f..1a1b165 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -2,11 +2,10 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libtasklist\" \
- -DLOCALEDIR=\"$(localedir)\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libtasklist.la
@@ -37,7 +36,7 @@ libtasklist_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libtasklist_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(EXO_LIBS) \
$(GTK_LIBS) \
@@ -47,13 +46,13 @@ libtasklist_la_LIBADD = \
$(XFCONF_LIBS)
libtasklist_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = tasklist.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 9d2c071..1f424e0 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -2,11 +2,10 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libwindowmenu\" \
- -DLOCALEDIR=\"$(localedir)\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
$(PLATFORM_CPPFLAGS)
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel
plugin_LTLIBRARIES = \
libwindowmenu.la
@@ -36,7 +35,7 @@ libwindowmenu_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
libwindowmenu_la_LIBADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(EXO_LIBS) \
$(GTK_LIBS) \
@@ -46,13 +45,13 @@ libwindowmenu_la_LIBADD = \
$(XFCONF_LIBS)
libwindowmenu_la_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel
desktop_in_files = windowmenu.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index ea9e280..1166120 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,53 +1,48 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_builddir) \
-DG_LOG_DOMAIN=\"xfce4-panel-wrapper\" \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/xfce4\" \
- -DLIBEXECDIR=\"$(libexecdir)/xfce4\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-libexec_PROGRAMS = \
- xfce4-panel-wrapper
+wrapperdir = $(libexecdir)/xfce4/panel
-xfce4_panel_wrapper_built_sources = \
+wrapper_PROGRAMS = \
+ wrapper
+
+wrapper_built_sources = \
wrapper-dbus-client-infos.h \
wrapper-marshal.h \
wrapper-marshal.c
-xfce4_panel_wrapper_SOURCES = \
- $(xfce4_panel_wrapper_built_sources) \
+wrapper_SOURCES = \
+ $(wrapper_built_sources) \
main.c \
wrapper-module.c \
wrapper-module.h \
wrapper-plug.c \
wrapper-plug.h
-xfce4_panel_wrapper_CFLAGS = \
+wrapper_CFLAGS = \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS) \
$(GMODULE_CFLAGS) \
- $(GTHREAD_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(PLATFORM_CFLAGS)
-xfce4_panel_wrapper_LDFLAGS = \
+wrapper_LDFLAGS = \
-no-undefined \
$(PLATFORM_LDFLAGS)
-xfce4_panel_wrapper_LDADD = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la \
+wrapper_LDADD = \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(GTK_LIBS) \
$(DBUS_LIBS) \
$(GMODULE_LIBS) \
- $(GTHREAD_LIBS) \
$(LIBXFCE4UTIL_LIBS)
-xfce4_panel_wrapper_DEPENDENCIES = \
- $(top_builddir)/libxfce4panel/libxfce4panel.la
+wrapper_DEPENDENCIES = \
+ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la
if MAINTAINER_MODE
wrapper-dbus-client-infos.h: $(top_builddir)/panel/panel-dbus-service-infos.xml Makefile
@@ -61,10 +56,10 @@ wrapper-marshal.c: $(top_builddir)/panel/panel-marshal.list Makefile
&& glib-genmarshal --body --prefix=wrapper_marshal $< >> $@
BUILT_SOURCES = \
- $(xfce4_panel_wrapper_built_sources)
+ $(wrapper_built_sources)
DISTCLEANFILES = \
- $(xfce4_panel_wrapper_built_sources)
+ $(wrapper_built_sources)
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
More information about the Xfce4-commits
mailing list