[Xfce4-commits] <xfce4-panel:nick/gtk3> Made wrapper versioning parallel to libxfce4panel.

[Peter de Ridder]

Updating branch refs/heads/nick/gtk3
         to 5b61215ff6495ab260aa9f69cf4c8f1178c62325 (commit)
       from 4266d3766f4e0222391967e034e1d396ae16b5a2 (commit)

commit 5b61215ff6495ab260aa9f69cf4c8f1178c62325
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Apr 7 22:45:36 2013 +0200

    Made wrapper versioning parallel to libxfce4panel.

 wrapper/Makefile.am |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 86abda1..fa56540 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -8,12 +8,12 @@ AM_CPPFLAGS = \
 wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel
 
 wrapper_PROGRAMS = \
-	wrapper3
+	wrapper-2.0
 
 wrapper_built_sources = \
 	wrapper-dbus-client-infos.h
 
-wrapper3_SOURCES = \
+wrapper_2_0_SOURCES = \
 	$(wrapper_built_sources) \
 	main.c \
 	wrapper-module.c \
@@ -21,25 +21,25 @@ wrapper3_SOURCES = \
 	wrapper-plug.c \
 	wrapper-plug.h
 
-wrapper3_CFLAGS = \
+wrapper_2_0_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-wrapper3_LDFLAGS = \
+wrapper_2_0_LDFLAGS = \
 	-no-undefined \
 	$(PLATFORM_LDFLAGS)
 
-wrapper3_LDADD = \
+wrapper_2_0_LDADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(GTK_LIBS) \
 	$(DBUS_LIBS) \
 	$(GMODULE_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)
 
-wrapper3_DEPENDENCIES = \
+wrapper_2_0_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la
 
 #
@@ -47,9 +47,9 @@ wrapper3_DEPENDENCIES = \
 #
 if ENABLE_GTK2_LIBRARY
 
-wrapper_PROGRAMS += wrapper2
+wrapper_PROGRAMS += wrapper-1.0
 
-wrapper2_SOURCES = \
+wrapper_1_0_SOURCES = \
 	$(wrapper_built_sources) \
 	main.c \
 	wrapper-module.c \
@@ -57,25 +57,25 @@ wrapper2_SOURCES = \
 	wrapper-plug.c \
 	wrapper-plug.h
 
-wrapper2_CFLAGS = \
+wrapper_1_0_CFLAGS = \
 	$(GTK2_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-wrapper2_LDFLAGS = \
+wrapper_1_0_LDFLAGS = \
 	-no-undefined \
 	$(PLATFORM_LDFLAGS)
 
-wrapper2_LDADD = \
+wrapper_1_0_LDADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-1.0.la \
 	$(GTK2_LIBS) \
 	$(DBUS_LIBS) \
 	$(GMODULE_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)
 
-wrapper2_DEPENDENCIES = \
+wrapper_1_0_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-1.0.la
 
 endif