GNOME.org
 

[gnome-applets/wip/muktupavels/cleanup: 4/17] build: always build multiload and netspeed applets

commit 0c2f43911a7a69991b33694386cf55c06e03a68e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 24 16:38:13 2020 +0200

    build: always build multiload and netspeed applets

 Makefile.am                          |  8 ++------
 configure.ac                         | 13 ++++---------
 data/icons/16x16/apps/Makefile.am    |  7 +------
 data/icons/16x16/devices/Makefile.am |  5 -----
 data/icons/16x16/status/Makefile.am  |  5 -----
 data/icons/22x22/apps/Makefile.am    |  7 +------
 data/icons/24x24/apps/Makefile.am    |  7 +------
 data/icons/32x32/apps/Makefile.am    |  7 +------
 data/icons/48x48/apps/Makefile.am    |  7 +------
 data/icons/scalable/apps/Makefile.am |  7 +------
 help/Makefile.am                     |  9 ++-------
 11 files changed, 14 insertions(+), 68 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0af01b745..309056810 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,5 @@
 NULL =
 
-gtop_applets = multiload netspeed
-if BUILD_GTOP_APPLETS
-gtop_SUBDIRS = $(gtop_applets)
-endif
-
 if BUILD_BATTSTAT_APPLET
 battstat_SUBDIR = battstat
 endif
@@ -34,6 +29,8 @@ always_built_SUBDIRS =  \
        geyes           \
        gweather \
        mini-commander \
+       multiload \
+       netspeed \
        sticky-notes    \
        trash \
        window-buttons \
@@ -46,7 +43,6 @@ SUBDIRS = \
        help \
        po                      \
        $(always_built_SUBDIRS) \
-       $(gtop_SUBDIRS)         \
        $(vfs_SUBDIRS)          \
        $(battstat_SUBDIR)      \
        $(accessx_status_SUBDIR)\
diff --git a/configure.ac b/configure.ac
index 07d1675e5..1cd99ba20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,13 +130,8 @@ AC_SUBST(LIBPANEL_APPLET_DIR)
 dnl -- check for X11 (required) -----------------------------------------------
 PKG_CHECK_MODULES([X11], [x11])
 
-dnl -- check for libgtop (optional) -------------------------------------------
-build_gtop_applets=false
-PKG_CHECK_MODULES(GTOP_APPLETS,
-                 [libgtop-2.0 >= $LIBGTOP_REQUIRED],
-                 build_gtop_applets=true,
-                AC_MSG_WARN([libgtop not found. Not building gtop applets.]))
-AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
+dnl -- check for libgtop (required) -------------------------------------------
+PKG_CHECK_MODULES(GTOP_APPLETS, [libgtop-2.0 >= $LIBGTOP_REQUIRED])
 
 dnl -- check for libwnck (required) -------------------------------------------
 PKG_CHECK_MODULES(LIBWNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED,,
@@ -657,8 +652,8 @@ echo "    geyes .........................: always"
 echo "    gweather ......................: always"
 echo "    inhibit .......................: always"
 echo "    mini-commander ................: always"
-echo "    multiload .....................: $build_gtop_applets"
-echo "    netspeed ......................: $build_gtop_applets"
+echo "    multiload .....................: always"
+echo "    netspeed ......................: always"
 echo "    sticky-notes ..................: always"
 echo "    timer .........................: $HAVE_LIBNOTIFY"
 echo "    tracker-search-bar ............: $have_tracker_search_bar"
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
index 606188ab2..7f81e244c 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
@@ -9,6 +9,7 @@ icons_DATA = \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
+       netspeed-applet.png \
        $(NULL)
 
 if BUILD_CPUFREQ_APPLET
@@ -17,12 +18,6 @@ icons_DATA += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-icons_DATA += \
-       netspeed-applet.png \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA) \
        $(NULL)
diff --git a/data/icons/16x16/devices/Makefile.am b/data/icons/16x16/devices/Makefile.am
index 53b2f3add..9a39b8ce1 100644
--- a/data/icons/16x16/devices/Makefile.am
+++ b/data/icons/16x16/devices/Makefile.am
@@ -6,15 +6,10 @@ context = devices
 
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
-       $(NULL)
-
-if BUILD_GTOP_APPLETS
-icons_DATA += \
        netspeed-loopback.png \
        netspeed-plip.png \
        netspeed-ppp.png \
        $(NULL)
-endif
 
 EXTRA_DIST = \
        $(icons_DATA) \
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index f878ad4dd..81026eef3 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -12,16 +12,11 @@ icons_DATA = \
        gpm-inhibit.png \
        gpm-inhibit-invalid.png \
        gpm-uninhibit.png \
-       $(NULL)
-
-if BUILD_GTOP_APPLETS
-icons_DATA += \
        netspeed-wireless-25.png \
        netspeed-wireless-50.png \
        netspeed-wireless-75.png \
        netspeed-wireless-100.png \
        $(NULL)
-endif
 
 EXTRA_DIST = \
        $(icons_DATA) \
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
index 4eee68c2e..55fb879dc 100644
--- a/data/icons/22x22/apps/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
@@ -9,6 +9,7 @@ icons_DATA = \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
+       netspeed-applet.png \
        $(NULL)
 
 if BUILD_CPUFREQ_APPLET
@@ -17,12 +18,6 @@ icons_DATA += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-icons_DATA += \
-       netspeed-applet.png \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA) \
        $(NULL)
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
index 0b3ee913a..cce5fd74d 100644
--- a/data/icons/24x24/apps/Makefile.am
+++ b/data/icons/24x24/apps/Makefile.am
@@ -9,6 +9,7 @@ icons_DATA = \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
+       netspeed-applet.png \
        $(NULL)
 
 if BUILD_CPUFREQ_APPLET
@@ -17,12 +18,6 @@ icons_DATA += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-icons_DATA += \
-       netspeed-applet.png \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA)   \
        $(NULL)
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
index 52eb45777..ad2428700 100644
--- a/data/icons/32x32/apps/Makefile.am
+++ b/data/icons/32x32/apps/Makefile.am
@@ -9,6 +9,7 @@ icons_DATA = \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
+       netspeed-applet.png \
        $(NULL)
 
 if BUILD_CPUFREQ_APPLET
@@ -17,12 +18,6 @@ icons_DATA += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-icons_DATA += \
-       netspeed-applet.png \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA) \
        $(NULL)
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
index de00fc035..244606975 100644
--- a/data/icons/48x48/apps/Makefile.am
+++ b/data/icons/48x48/apps/Makefile.am
@@ -8,6 +8,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
+       netspeed-applet.png \
        $(NULL)
 
 if APPLET_ACCESSX
@@ -16,12 +17,6 @@ icons_DATA += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-icons_DATA += \
-       netspeed-applet.png \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA) \
        $(NULL)
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
index 382defa56..8e04f457d 100644
--- a/data/icons/scalable/apps/Makefile.am
+++ b/data/icons/scalable/apps/Makefile.am
@@ -9,6 +9,7 @@ icons_DATA = \
        gnome-brightness-applet.svg \
        gnome-inhibit-applet.svg \
        gnome-sticky-notes-applet.svg \
+       netspeed-applet.svg \
        $(NULL)
 
 if BUILD_CPUFREQ_APPLET
@@ -17,12 +18,6 @@ icons_DATA += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-icons_DATA += \
-       netspeed-applet.svg \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA) \
        $(NULL)
diff --git a/help/Makefile.am b/help/Makefile.am
index b6ed2a85b..9099b5ecf 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -6,6 +6,8 @@ SUBDIRS = \
        geyes \
        gweather \
        mini-commander \
+       multiload \
+       netspeed \
        sticky-notes \
        trash \
        $(NULL)
@@ -28,11 +30,4 @@ SUBDIRS += \
        $(NULL)
 endif
 
-if BUILD_GTOP_APPLETS
-SUBDIRS += \
-       multiload \
-       netspeed \
-       $(NULL)
-endif
-
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]