Commit ff4718e9 authored by Carlos Garcia Campos's avatar Carlos Garcia Campos
Browse files

Use versioned directory for in-process applets and .panel-applet files

parent 53408762
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment