GNOME.org
 

[gnome-panel/bonobo-less] [build, libpanel-applet] Rename the library to libpanel-applet-3

commit 9082d7e6eb268b4709d856387e874a2daf5c56e7
Author: Vincent Untz <vuntz gnome org>
Date:   Wed May 26 10:43:44 2010 +0200

    [build, libpanel-applet] Rename the library to libpanel-applet-3
    
    The library has changed and applets need to be ported; and this will
    make it possible to have libpanel-applet-2 parallel-installable.

 applets/clock/Makefile.am                          |    2 +-
 applets/fish/Makefile.am                           |   26 ++++++++++----------
 applets/notification_area/Makefile.am              |    2 +-
 applets/wncklet/Makefile.am                        |    2 +-
 configure.in                                       |    6 ++--
 libpanel-applet/Makefile.am                        |   20 +++++++-------
 libpanel-applet/libpanelapplet-2.0.pc.in           |   11 --------
 ....pc.in => libpanelapplet-3.0-uninstalled.pc.in} |    6 ++--
 libpanel-applet/libpanelapplet-3.0.pc.in           |   11 ++++++++
 9 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 588b858..cba6c0a 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -63,7 +63,7 @@ CLOCK_SOURCES = 		\
 	$(SETTIME_SOURCES)
 
 CLOCK_LDADD =						\
-	../../libpanel-applet/libpanel-applet-2.la	\
+	../../libpanel-applet/libpanel-applet-3.la	\
 	$(CLOCK_LIBS)					\
 	$(LIBPANEL_APPLET_LIBS)				\
 	$(POLKIT_LIBS)				\
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index d22d24f..2edc145 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -14,28 +14,28 @@ INCLUDES =							\
 FISH_SOURCES = fish.c
 
 FISH_LDADD =						\
-	../../libpanel-applet/libpanel-applet-2.la	\
+	../../libpanel-applet/libpanel-applet-3.la	\
 	$(FISH_LIBS)					\
 	$(LIBPANEL_APPLET_LIBS)
 
 if FISH_INPROCESS
 APPLET_IN_PROCESS = true
-APPLET_LOCATION   = $(pkglibdir)/libfish-applet-2.so
-
-fish_applet_2libdir = $(pkglibdir)
-fish_applet_2lib_LTLIBRARIES = libfish-applet-2.la
-libfish_applet_2_la_SOURCES = $(FISH_SOURCES)
-libfish_applet_2_la_LIBADD = $(FISH_LDADD)
-libfish_applet_2_la_LDFLAGS = -module -avoid-version
-libfish_applet_2_la_CFLAGS =
+APPLET_LOCATION   = $(pkglibdir)/libfish-applet.so
+
+fish_applet_libdir = $(pkglibdir)
+fish_applet_lib_LTLIBRARIES = libfish-applet.la
+libfish_applet_la_SOURCES = $(FISH_SOURCES)
+libfish_applet_la_LIBADD = $(FISH_LDADD)
+libfish_applet_la_LDFLAGS = -module -avoid-version
+libfish_applet_la_CFLAGS =
 else
 APPLET_IN_PROCESS = false
-APPLET_LOCATION = $(libexecdir)/fish-applet-2
+APPLET_LOCATION = $(libexecdir)/fish-applet
 
-libexec_PROGRAMS = fish-applet-2
-fish_applet_2_SOURCES = $(FISH_SOURCES)
-fish_applet_2_LDADD = $(FISH_LDADD)
-fish_applet_2_CFLAGS =
+libexec_PROGRAMS = fish-applet
+fish_applet_SOURCES = $(FISH_SOURCES)
+fish_applet_LDADD = $(FISH_LDADD)
+fish_applet_CFLAGS =
 endif
 
 FISH_BITMAPS =		\
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 5478cd7..9e91025 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -29,7 +29,7 @@ NOTIFICATION_AREA_SOURCES =		\
 	na-marshal.h
 
 NOTIFICATION_AREA_LDADD =			\
-	../../libpanel-applet/libpanel-applet-2.la	\
+	../../libpanel-applet/libpanel-applet-3.la	\
 	$(X_LIBS)					\
 	$(NOTIFICATION_AREA_LIBS)			\
 	$(LIBPANEL_APPLET_LIBS)
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index cf45fee..a66d121 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -31,7 +31,7 @@ WNCKLET_SOURCES = \
 $(wnck_applet_OBJECTS): $(BUILT_SOURCES)
 
 WNCKLET_LDADD =						\
-	../../libpanel-applet/libpanel-applet-2.la	\
+	../../libpanel-applet/libpanel-applet-3.la	\
 	$(WNCKLET_LIBS)					\
 	$(LIBPANEL_APPLET_LIBS)
 
diff --git a/configure.in b/configure.in
index 79ad0a4..806c8e4 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ GNOME_COMMON_INIT
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-LIB_PANEL_APPLET_LT_VERSION=2:67:2
+LIB_PANEL_APPLET_LT_VERSION=0:0:0
 AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
 
 AM_MAINTAINER_MODE
@@ -329,8 +329,8 @@ gnome-panel/libegg/Makefile
 gnome-panel/libpanel-applet-private/Makefile
 gnome-panel/libpanel-util/Makefile
 gnome-panel/gnome-panel.desktop.in
-libpanel-applet/libpanelapplet-2.0.pc
-libpanel-applet/libpanelapplet-2.0-uninstalled.pc
+libpanel-applet/libpanelapplet-3.0.pc
+libpanel-applet/libpanelapplet-3.0-uninstalled.pc
 libpanel-applet/Makefile
 po/Makefile.in
 applets/Makefile
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 2b31796..d23fd01 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -6,9 +6,9 @@ INCLUDES =							\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
 	$(WARN_CFLAGS)
 
-lib_LTLIBRARIES = libpanel-applet-2.la
+lib_LTLIBRARIES = libpanel-applet-3.la
 
-libpanel_applet_2_la_SOURCES =		\
+libpanel_applet_3_la_SOURCES =		\
 	$(BUILT_SOURCES)		\
 	panel-applet.h			\
 	panel-applet.c			\
@@ -17,15 +17,15 @@ libpanel_applet_2_la_SOURCES =		\
 	panel-applet-gconf.c		\
 	panel-applet-gconf.h
 
-libpanel_applet_2_la_LDFLAGS = \
+libpanel_applet_3_la_LDFLAGS = \
 	-version-info $(LIB_PANEL_APPLET_LT_VERSION)	\
 	-no-undefined
 
-libpanel_applet_2_la_LIBADD  = \
+libpanel_applet_3_la_LIBADD  = \
 	$(LIBPANEL_APPLET_LIBS) \
 	$(X_LIBS)
 
-libpanel_appletincludedir = $(includedir)/panel-2.0
+libpanel_appletincludedir = $(includedir)/gnome-panel-3.0/libpanel-applet
 
 libpanel_appletinclude_HEADERS =	\
 	panel-applet.h			\
@@ -36,7 +36,7 @@ noinst_PROGRAMS = test-dbus-applet
 
 test_dbus_applet_LDADD =               \
        $(LIBPANEL_APPLET_LIBS)         \
-       libpanel-applet-2.la
+       libpanel-applet-3.la
 
 BUILT_SOURCES = \
 	panel-applet-enums.c			\
@@ -44,13 +44,13 @@ BUILT_SOURCES = \
 	panel-applet-marshal.c			\
 	panel-applet-marshal.h
 
-$(libpanel_applet_2_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
+$(libpanel_applet_3_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
 
 EXTRA_DIST =						\
 	org.gnome.panel.TestApplet.panel-applet.in	\
 	panel-applet-marshal.list			\
-	libpanelapplet-2.0.pc.in			\
-	libpanelapplet-2.0-uninstalled.pc.in
+	libpanelapplet-3.0.pc.in			\
+	libpanelapplet-3.0-uninstalled.pc.in
 
 panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
@@ -90,7 +90,7 @@ panel-applet-enums.h: @REBUILD@ $(panel_applet_enum_headers)
 		$(panel_applet_enum_headers) > $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpanelapplet-2.0.pc
+pkgconfig_DATA = libpanelapplet-3.0.pc
 
 CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
 
diff --git a/libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in b/libpanel-applet/libpanelapplet-3.0-uninstalled.pc.in
similarity index 61%
rename from libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in
rename to libpanel-applet/libpanelapplet-3.0-uninstalled.pc.in
index e00ab6f..a0899ce 100644
--- a/libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in
+++ b/libpanel-applet/libpanelapplet-3.0-uninstalled.pc.in
@@ -3,9 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: libpanel-applet-2
-Description: libpanel-applet-2
+Name: libpanel-applet-3
+Description: libpanel-applet-3
 Requires: glib-2.0 gconf-2.0 gtk+-2.0
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libpanel-applet-2.la
+Libs: ${pc_top_builddir}/${pcfiledir}/libpanel-applet-3.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libpanel-applet/libpanelapplet-3.0.pc.in b/libpanel-applet/libpanelapplet-3.0.pc.in
new file mode 100644
index 0000000..acf12f3
--- /dev/null
+++ b/libpanel-applet/libpanelapplet-3.0.pc.in
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libpanel-applet-3
+Description: libpanel-applet-3
+Requires: glib-2.0 gconf-2.0 gtk+-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lpanel-applet-3
+Cflags: -I${includedir}/gnome-panel-3.0/libpanel-applet
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]