[gnome-panel] build: remove LIBPANEL_APPLET_API_VERSION

[Alberts Muktupāvels <muktupavels src gnome org>]

commit bf18e6e4237a7f8f841975e222c44d52e000d125
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Sep 21 15:43:33 2016 +0300

    build: remove LIBPANEL_APPLET_API_VERSION

 applets/clock/Makefile.am                         |    4 ++--
 applets/fish/Makefile.am                          |    4 ++--
 applets/notification_area/Makefile.am             |    4 ++--
 applets/status-notifier/Makefile.am               |    4 ++--
 applets/wncklet/Makefile.am                       |    4 ++--
 configure.ac                                      |    7 ++-----
 libpanel-applet/libpanel-applet-uninstalled.pc.in |    2 --
 libpanel-applet/libpanel-applet.pc.in             |    1 -
 8 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 5013fc0..328f5c7 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -96,9 +96,9 @@ test_system_timezone_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libclock-applet.so
+APPLET_LOCATION   = $(pkglibdir)/libclock-applet.so
 
-clock_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+clock_appletlibdir = $(pkglibdir)
 clock_appletlib_LTLIBRARIES = libclock-applet.la
 $(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
 
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index b659ebc..b7b2d92 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -27,9 +27,9 @@ libfish_applet_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libfish-applet.so
+APPLET_LOCATION   = $(pkglibdir)/libfish-applet.so
 
-fish_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+fish_applet_libdir = $(pkglibdir)
 fish_applet_lib_LTLIBRARIES = libfish-applet.la
 
 appletdir       = $(appletsdir)
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 0de706d..9b18a57 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -62,9 +62,9 @@ testtray_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnotification-area-applet.so
+APPLET_LOCATION   = $(pkglibdir)/libnotification-area-applet.so
 
-notification_area_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+notification_area_appletlibdir = $(pkglibdir)
 notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
 
 appletdir       = $(appletsdir)
diff --git a/applets/status-notifier/Makefile.am b/applets/status-notifier/Makefile.am
index 211b65a..f8e985e 100644
--- a/applets/status-notifier/Makefile.am
+++ b/applets/status-notifier/Makefile.am
@@ -34,9 +34,9 @@ libsn_applet_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libsn-applet.so
+APPLET_LOCATION = $(pkglibdir)/libsn-applet.so
 
-sn_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+sn_applet_libdir = $(pkglibdir)
 sn_applet_lib_LTLIBRARIES = libsn-applet.la
 
 appletdir = $(appletsdir)
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index f9fa3a2..330cb19 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -39,9 +39,9 @@ libwnck_applet_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwnck-applet.so
+APPLET_LOCATION   = $(pkglibdir)/libwnck-applet.so
 
-wnck_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+wnck_appletlibdir = $(pkglibdir)
 wnck_appletlib_LTLIBRARIES = libwnck-applet.la
 
 appletdir       = $(appletsdir)
diff --git a/configure.ac b/configure.ac
index 0776010..798fa7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,9 +65,6 @@ LT_LIB_M
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-LIBPANEL_APPLET_API_VERSION=5.0
-AC_SUBST([LIBPANEL_APPLET_API_VERSION])
-
 LIB_PANEL_APPLET_LT_VERSION=1:0:1
 AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
 
@@ -212,8 +209,8 @@ dnl Modules dir
 AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
 
 dnl Applets dir
-AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/\$(LIBPANEL_APPLET_API_VERSION)/applets")
-AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/\${libpanel_applet_api_version}/applets")
+AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/applets")
+AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/applets")
 
 dnl  Language Support
 
diff --git a/libpanel-applet/libpanel-applet-uninstalled.pc.in 
b/libpanel-applet/libpanel-applet-uninstalled.pc.in
index 87c3a0a..09b2d33 100644
--- a/libpanel-applet/libpanel-applet-uninstalled.pc.in
+++ b/libpanel-applet/libpanel-applet-uninstalled.pc.in
@@ -3,8 +3,6 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-libpanel_applet_api_version=@LIBPANEL_APPLET_API_VERSION@
-
 Name: libpanel-applet
 Description: libpanel-applet
 Requires: glib-2.0 gtk+-3.0
diff --git a/libpanel-applet/libpanel-applet.pc.in b/libpanel-applet/libpanel-applet.pc.in
index e5a0181..03f823e 100644
--- a/libpanel-applet/libpanel-applet.pc.in
+++ b/libpanel-applet/libpanel-applet.pc.in
@@ -5,7 +5,6 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 
-libpanel_applet_api_version=@LIBPANEL_APPLET_API_VERSION@
 libpanel_applet_dir=@appletsdir_pkgconfig@
 
 Name: libpanel-applet