GNOME.org
 

[gnome-applets/wip/gnome-3.10+: 46/48] update for new libpanel-applet version

commit 4311f125022499e35576a78dd15a52893011105e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Jul 13 10:30:33 2014 +0300

    update for new libpanel-applet version

 accessx-status/Makefile.am     |    2 +-
 battstat/Makefile.am           |    2 +-
 charpick/Makefile.am           |    2 +-
 configure.ac                   |    9 +++++----
 cpufreq/Makefile.am            |    2 +-
 drivemount/Makefile.am         |    2 +-
 geyes/Makefile.am              |    2 +-
 gweather/Makefile.am           |    2 +-
 invest-applet/data/Makefile.am |    2 +-
 mini-commander/src/Makefile.am |    2 +-
 mixer/Makefile.am              |    2 +-
 modemlights/Makefile.am        |    2 +-
 multiload/Makefile.am          |    2 +-
 stickynotes/Makefile.am        |    2 +-
 trashapplet/Makefile.am        |    2 +-
 15 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index b98c5cc..5a0fa61 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -20,7 +20,7 @@ accessx_status_applet_LDADD = \
        $(GIO_UNIX_LIBS)        \
         $(X_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.AccessxStatusApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 8fdbad9..ff77ab3 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -75,7 +75,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.BattstatApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 297f324..3df82af 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -17,7 +17,7 @@ charpick_applet2_LDADD = \
                       $(GNOME_APPLETS_LIBS)    \
                       $(GUCHARMAP_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.CharpickerApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/configure.ac b/configure.ac
index fb4df79..feb5e66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl ***************************************************************************
 GTK_REQUIRED=3.2
 GLIB_REQUIRED=2.26.0
 GIO_REQUIRED=2.26.0
-LIBPANEL_REQUIRED=2.91.90
+LIBPANEL_REQUIRED=3.10.0
 LIBGTOP_REQUIRED=2.11.92
 LIBXKLAVIER_REQUIRED=4.0
 LIBWNCK_REQUIRED=2.91.0
@@ -118,12 +118,13 @@ AC_SUBST(GTK_FLAGS)
 AC_SUBST(GTK_LIBS)
 
 dnl -- check for libpanelapplet (required) ------------------------------------
-PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-4.0 >= $LIBPANEL_REQUIRED)
-LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
-AC_SUBST(LIBPANEL_APPLET_DIR)
+PKG_CHECK_MODULES(GNOME_APPLETS, libpanel-applet >= $LIBPANEL_REQUIRED)
 AC_SUBST(GNOME_APPLETS_CFLAGS)
 AC_SUBST(GNOME_APPLETS_LIBS)
 
+LIBPANEL_APPLET_API_VERSION=`$PKG_CONFIG --variable=libpanel_applet_api_version libpanel-applet`
+AC_SUBST(LIBPANEL_APPLET_API_VERSION)
+
 dnl -- check for libgtop (optional) -------------------------------------------
 build_gtop_applets=false
 PKG_CHECK_MODULES(GTOP_APPLETS,
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 969381f..028193b 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -16,7 +16,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.CPUFreqApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 683a9e3..fac7710 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -22,7 +22,7 @@ drivemount_applet2_LDADD =    \
        $(GIO_UNIX_LIBS)
 
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.DriveMountApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index faa4b0b..21dedf9 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -19,7 +19,7 @@ geyes_applet2_LDADD =                 \
        $(GNOME_APPLETS_LIBS)   \
        $(LIBM)
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index 6614088..1f6b4e3 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -37,7 +37,7 @@ gweather_applet_2_LDADD =     \
 uidir = $(pkgdatadir)/ui
 ui_DATA = gweather-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.GWeatherApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index 8247530..87a26e0 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -12,7 +12,7 @@ org.gnome.panel.applet.InvestAppletFactory.service: $(service_in_files)
             -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.InvestApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index d6bdd4b..90c3750 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -55,7 +55,7 @@ update-icon-cache:
                echo "***   $(gtk_update_icon_cache)"; \
        fi
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.MiniCommanderApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/mixer/Makefile.am b/mixer/Makefile.am
index bc0593e..95abf6a 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -23,7 +23,7 @@ mixer_applet2_LDADD =                                         \
        $(MIXER_LIBS)                                   \
        $(GNOME_APPLETS_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.MixerApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index 5052acb..9109902 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -18,7 +18,7 @@ modem_applet_LDADD =          \
 uidir  = $(pkgdatadir)/ui
 ui_DATA        = modem-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.ModemApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index bade252..7bfa645 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -49,7 +49,7 @@ EXTRA_DIST =                                                  \
 uidir          = $(pkgdatadir)/ui
 ui_DATA                = multiload-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.MultiLoadApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 7e6b223..ef58baf 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -55,7 +55,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-appletdir   = $(datadir)/gnome-panel/4.0/applets
+appletdir   = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index d63ae67..27b22a7 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help src
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
 applet_in_files = org.gnome.applets.TrashApplet.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]