[gnome-panel/gtk3] Use versioned directory for in-process applets and .panel-applet files
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/gtk3] Use versioned directory for in-process applets and .panel-applet files
- Date: Sun, 16 Jan 2011 10:39:37 +0000 (UTC)
commit ff4718e97d7745ed053e248241f130a376e5f415
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Sun Jan 16 11:38:02 2011 +0100
Use versioned directory for in-process applets and .panel-applet files
applets/clock/Makefile.am | 6 +++---
applets/fish/Makefile.am | 6 +++---
applets/notification_area/Makefile.am | 6 +++---
applets/wncklet/Makefile.am | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index defa4f4..645dce0 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -71,9 +71,9 @@ test_system_timezone_LDADD = libsystem-timezone.la
if CLOCK_INPROCESS
APPLET_IN_PROCESS = true
-APPLET_LOCATION = $(pkglibdir)/libclock-applet.so
+APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libclock-applet.so
-clock_appletlibdir = $(pkglibdir)
+clock_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
clock_appletlib_LTLIBRARIES = libclock-applet.la
libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
libclock_applet_la_CPPFLAGS = $(CLOCK_CPPFLAGS)
@@ -136,7 +136,7 @@ BUILT_SOURCES = \
clock-typebuiltins.c \
clock-typebuiltins.h
-appletdir = $(datadir)/gnome-panel/applets
+appletdir = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
applet_in_files = org.gnome.panel.ClockApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 157cc55..b878b08 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -21,9 +21,9 @@ FISH_LDADD = \
if FISH_INPROCESS
APPLET_IN_PROCESS = true
-APPLET_LOCATION = $(pkglibdir)/libfish-applet.so
+APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libfish-applet.so
-fish_applet_libdir = $(pkglibdir)
+fish_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
fish_applet_lib_LTLIBRARIES = libfish-applet.la
libfish_applet_la_SOURCES = $(FISH_SOURCES)
libfish_applet_la_LIBADD = $(FISH_LDADD)
@@ -39,7 +39,7 @@ fish_applet_LDADD = $(FISH_LDADD)
fish_applet_CFLAGS = $(AM_CFLAGS)
endif
-appletdir = $(datadir)/gnome-panel/applets
+appletdir = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index d933e41..ca70fb1 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -43,9 +43,9 @@ testtray_LDADD = \
if NOTIFICATION_AREA_INPROCESS
APPLET_IN_PROCESS = true
-APPLET_LOCATION = $(pkglibdir)/libnotification-area-applet.so
+APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnotification-area-applet.so
-notification_area_appletlibdir = $(pkglibdir)
+notification_area_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
@@ -70,7 +70,7 @@ na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
BUILT_SOURCES = na-marshal.c na-marshal.h
-appletdir = $(datadir)/gnome-panel/applets
+appletdir = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 8311782..f89cd98 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -32,9 +32,9 @@ WNCKLET_LDADD = \
if WNCKLET_INPROCESS
APPLET_IN_PROCESS = true
-APPLET_LOCATION = $(pkglibdir)/libwnck-applet.so
+APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwnck-applet.so
-wnck_appletlibdir = $(pkglibdir)
+wnck_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
wnck_appletlib_LTLIBRARIES = libwnck-applet.la
libwnck_applet_la_SOURCES = $(WNCKLET_SOURCES)
libwnck_applet_la_LIBADD = $(WNCKLET_LDADD)
@@ -50,7 +50,7 @@ wnck_applet_LDADD = $(WNCKLET_LDADD)
wnck_applet_CFLAGS = $(AM_CFLAGS)
endif
-appletdir = $(datadir)/gnome-panel/applets
+appletdir = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
applet_in_files = org.gnome.panel.Wncklet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]