[Xfce4-commits] <xfce4-panel:devel> Rename from common library to libpanel-common.la.

Mon Sep 28 15:58:01 CEST 2009

Updating branch refs/heads/devel
         to 1644b684282ea2fa36dac2c12797c901a36b345d (commit)
       from 0ef318f60296bf72f8e4a82221ec339839f8dd9d (commit)

commit 1644b684282ea2fa36dac2c12797c901a36b345d
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Sep 28 15:44:24 2009 +0200

    Rename from common library to libpanel-common.la.

 common/Makefile.am             |   15 ++++++++-------
 panel/Makefile.am              |    4 ++--
 plugins/actions/Makefile.am    |    8 ++++----
 plugins/clock/Makefile.am      |    8 ++++----
 plugins/launcher/Makefile.am   |    4 ++--
 plugins/pager/Makefile.am      |   10 +++++-----
 plugins/separator/Makefile.am  |    8 ++++----
 plugins/systray/Makefile.am    |    8 ++++----
 plugins/tasklist/Makefile.am   |    8 ++++----
 plugins/windowmenu/Makefile.am |    8 ++++----
 10 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 3da0d91..e2dc649 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -2,28 +2,29 @@
 
 INCLUDES = \
 	-I$(top_srcdir) \
-	-DG_LOG_DOMAIN=\"libpanel-xfconf\" \
+	-DG_LOG_DOMAIN=\"libpanel-common\" \
 	-DLIBXFCE4PANEL_COMPILATION \
 	$(PLATFORM_CPPFLAGS)
 
 noinst_LTLIBRARIES = \
-	libpanel-xfconf.la
+	libpanel-common.la
 
-libpanel_xfconf_la_SOURCES = \
+libpanel_common_la_SOURCES = \
 	panel-builder.c \
 	panel-builder.h \
 	panel-xfconf.c \
 	panel-xfconf.h
 
-libpanel_xfconf_la_CFLAGS = \
+libpanel_common_la_CFLAGS = \
 	$(XFCONF_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
-libpanel_xfconf_la_LDFLAGS = \
+libpanel_common_la_LDFLAGS = \
 	-no-undefined \
 	$(PLATFORM_LDFLAGS)
 
-libpanel_xfconf_la_LIBADD = \
+libpanel_common_la_LIBADD = \
 	$(XFCONF_LIBS) \
 	$(GTK_LIBS)
 
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 04e0452..c24cfac 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -67,7 +67,7 @@ xfce4_panel_LDFLAGS = \
 
 xfce4_panel_LDADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
 	$(EXO_LIBS) \
 	$(GMODULE_LIBS) \
@@ -79,7 +79,7 @@ xfce4_panel_LDADD = \
 
 xfce4_panel_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 if MAINTAINER_MODE
 
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index d1c7306..32336b5 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -23,9 +23,9 @@ libactions_la_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(PLATFORM_CFLAGS) \
 	$(EXO_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 libactions_la_LDFLAGS = \
 	-avoid-version \
@@ -36,7 +36,7 @@ libactions_la_LDFLAGS = \
 
 libactions_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
@@ -45,7 +45,7 @@ libactions_la_LIBADD = \
 
 libactions_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 360f1d7..9f3dcd3 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -34,9 +34,9 @@ libclock_la_CFLAGS = \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(CAIRO_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(PLATFORM_CFLAGS) \
 	$(EXO_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 libclock_la_LDFLAGS =	 \
 	-avoid-version \
@@ -47,7 +47,7 @@ libclock_la_LDFLAGS =	 \
 
 libclock_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
@@ -57,7 +57,7 @@ libclock_la_LIBADD = \
 
 libclock_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index 13e6593..6a1a81a 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -44,7 +44,7 @@ liblauncher_la_LDFLAGS = \
 
 liblauncher_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
@@ -55,7 +55,7 @@ liblauncher_la_LIBADD = \
 
 liblauncher_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index 122b1ad..0d53003 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -22,9 +22,9 @@ libpager_la_SOURCES = \
 
 libpager_la_CFLAGS = \
 	$(GTK_CFLAGS) \
+	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
-	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(EXO_CFLAGS) \
 	$(PLATFORM_CFLAGS)
@@ -38,17 +38,17 @@ libpager_la_LDFLAGS = \
 
 libpager_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBWNCK_LIBS) \
-	$(XFCONF_LIBS) \
 	$(EXO_LIBS) \
-	$(LIBXFCE4UI_LIBS)
+	$(LIBXFCE4UI_LIBS) \
+	$(XFCONF_LIBS)
 
 libpager_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 171deb2..f03db0c 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -21,12 +21,12 @@ libseparator_la_SOURCES = \
 
 libseparator_la_CFLAGS = \
 	$(GTK_CFLAGS) \
+	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(CAIRO_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(PLATFORM_CFLAGS) \
 	$(EXO_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(PLATFORM_CFLAGS)
 
 libseparator_la_LDFLAGS = \
 	-avoid-version \
@@ -37,7 +37,7 @@ libseparator_la_LDFLAGS = \
 
 libseparator_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
@@ -47,7 +47,7 @@ libseparator_la_LIBADD = \
 
 libseparator_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 9f409f3..78713eb 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -45,17 +45,17 @@ libsystray_la_LDFLAGS = \
 
 libsystray_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(LIBX11_LIBS) \
 	$(GTK_LIBS) \
 	$(EXO_LIBS) \
-	$(XFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBXFCE4UI_LIBS)
+	$(LIBXFCE4UI_LIBS) \
+	$(XFCONF_LIBS)
 
 libsystray_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 2db5a69..ed8cbcb 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -39,17 +39,17 @@ libtasklist_la_LDFLAGS = \
 
 libtasklist_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(EXO_LIBS) \
 	$(GTK_LIBS) \
-	$(XFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
-	$(LIBWNCK_LIBS)
+	$(LIBWNCK_LIBS) \
+	$(XFCONF_LIBS)
 
 libtasklist_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 387d994..1c2dcfe 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -38,17 +38,17 @@ libwindowmenu_la_LDFLAGS = \
 
 libwindowmenu_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la \
+	$(top_builddir)/common/libpanel-common.la \
 	$(EXO_LIBS) \
 	$(GTK_LIBS) \
-	$(XFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
-	$(LIBWNCK_LIBS)
+	$(LIBWNCK_LIBS) \
+	$(XFCONF_LIBS)
 
 libwindowmenu_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel.la \
-	$(top_builddir)/common/libpanel-xfconf.la
+	$(top_builddir)/common/libpanel-common.la
 
 #
 # .desktop file

