[gnome-applets/wip/muktupavels/icons] build: move all icons dirs to data/icons

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-applets/wip/muktupavels/icons] build: move all icons dirs to data/icons
Date: Mon, 23 Mar 2020 23:11:35 +0000 (UTC)
commit 2edfd7b1333881da55d4a991daf0a34d06ef06f8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 24 01:07:17 2020 +0200

    build: move all icons dirs to data/icons

 Makefile.am                                        |   2 +
 brightness/Makefile.am                             |   2 +-
 brightness/icons/16x16/apps/Makefile.am            |  16 -----
 brightness/icons/16x16/status/Makefile.am          |  18 -----
 brightness/icons/22x22/apps/Makefile.am            |  16 -----
 brightness/icons/22x22/status/Makefile.am          |  18 -----
 brightness/icons/24x24/apps/Makefile.am            |  16 -----
 brightness/icons/24x24/status/Makefile.am          |  18 -----
 brightness/icons/32x32/apps/Makefile.am            |  16 -----
 brightness/icons/32x32/status/Makefile.am          |  18 -----
 brightness/icons/48x48/apps/Makefile.am            |  16 -----
 brightness/icons/48x48/status/Makefile.am          |  18 -----
 brightness/icons/Makefile.am                       |  16 -----
 brightness/icons/scalable/Makefile.am              |   3 -
 brightness/icons/scalable/apps/Makefile.am         |  16 -----
 brightness/icons/scalable/status/Makefile.am       |  18 -----
 configure.ac                                       |  75 ++++++---------------
 data/Makefile.am                                   |   7 ++
 {netspeed => data}/icons/16x16/Makefile.am         |   1 -
 data/icons/16x16/apps/Makefile.am                  |  24 +++++++
 .../icons/16x16/apps/gnome-brightness-applet.png   | Bin
 .../icons/16x16/apps/gnome-inhibit-applet.png      | Bin
 .../icons/16x16/apps/netspeed-applet.png           | Bin
 {netspeed => data}/icons/16x16/devices/Makefile.am |  15 ++++-
 .../icons/16x16/devices/netspeed-loopback.png      | Bin
 .../icons/16x16/devices/netspeed-plip.png          | Bin
 .../icons/16x16/devices/netspeed-ppp.png           | Bin
 data/icons/16x16/status/Makefile.am                |  31 +++++++++
 .../16x16/status/gpm-brightness-lcd-disabled.png   | Bin
 .../16x16/status/gpm-brightness-lcd-invalid.png    | Bin
 .../icons/16x16/status/gpm-brightness-lcd.png      | Bin
 .../icons/16x16/status/gpm-inhibit-invalid.png     | Bin
 .../icons/16x16/status/gpm-inhibit.png             | Bin
 .../icons/16x16/status/gpm-uninhibit.png           | Bin
 .../icons/16x16/status/netspeed-wireless-100.png   | Bin
 .../icons/16x16/status/netspeed-wireless-25.png    | Bin
 .../icons/16x16/status/netspeed-wireless-50.png    | Bin
 .../icons/16x16/status/netspeed-wireless-75.png    | Bin
 .../icons/16x16 => data/icons/22x22}/Makefile.am   |   0
 data/icons/22x22/apps/Makefile.am                  |  24 +++++++
 .../icons/22x22/apps/gnome-brightness-applet.png   | Bin
 .../icons/22x22/apps/gnome-inhibit-applet.png      | Bin
 .../icons/22x22/apps/netspeed-applet.png           | Bin
 data/icons/22x22/status/Makefile.am                |  22 ++++++
 .../22x22/status/gpm-brightness-lcd-disabled.png   | Bin
 .../22x22/status/gpm-brightness-lcd-invalid.png    | Bin
 .../icons/22x22/status/gpm-brightness-lcd.png      | Bin
 .../icons/22x22/status/gpm-inhibit-invalid.png     | Bin
 .../icons/22x22/status/gpm-inhibit.png             | Bin
 .../icons/22x22/status/gpm-uninhibit.png           | Bin
 .../icons/22x22 => data/icons/24x24}/Makefile.am   |   0
 data/icons/24x24/apps/Makefile.am                  |  24 +++++++
 .../icons/24x24/apps/gnome-brightness-applet.png   | Bin
 .../icons/24x24/apps/gnome-inhibit-applet.png      | Bin
 .../icons/24x24/apps/netspeed-applet.png           | Bin
 data/icons/24x24/status/Makefile.am                |  22 ++++++
 .../24x24/status/gpm-brightness-lcd-disabled.png   | Bin
 .../24x24/status/gpm-brightness-lcd-invalid.png    | Bin
 .../icons/24x24/status/gpm-brightness-lcd.png      | Bin
 .../icons/24x24/status/gpm-inhibit-invalid.png     | Bin
 .../icons/24x24/status/gpm-inhibit.png             | Bin
 .../icons/24x24/status/gpm-uninhibit.png           | Bin
 .../icons/24x24 => data/icons/32x32}/Makefile.am   |   0
 data/icons/32x32/apps/Makefile.am                  |  24 +++++++
 .../icons/32x32/apps/gnome-brightness-applet.png   | Bin
 .../icons/32x32/apps/gnome-inhibit-applet.png      | Bin
 .../icons/32x32/apps/netspeed-applet.png           | Bin
 data/icons/32x32/status/Makefile.am                |  22 ++++++
 .../32x32/status/gpm-brightness-lcd-disabled.png   | Bin
 .../32x32/status/gpm-brightness-lcd-invalid.png    | Bin
 .../icons/32x32/status/gpm-brightness-lcd.png      | Bin
 .../icons/32x32/status/gpm-inhibit-invalid.png     | Bin
 .../icons/32x32/status/gpm-inhibit.png             | Bin
 .../icons/32x32/status/gpm-uninhibit.png           | Bin
 .../icons/32x32 => data/icons/48x48}/Makefile.am   |   0
 data/icons/48x48/apps/Makefile.am                  |  24 +++++++
 .../icons/48x48/apps/gnome-brightness-applet.png   | Bin
 .../icons/48x48/apps/gnome-inhibit-applet.png      | Bin
 .../icons/48x48/apps/netspeed-applet.png           | Bin
 data/icons/48x48/status/Makefile.am                |  22 ++++++
 .../48x48/status/gpm-brightness-lcd-disabled.png   | Bin
 .../48x48/status/gpm-brightness-lcd-invalid.png    | Bin
 .../icons/48x48/status/gpm-brightness-lcd.png      | Bin
 .../icons/48x48/status/gpm-inhibit-invalid.png     | Bin
 .../icons/48x48/status/gpm-inhibit.png             | Bin
 .../icons/48x48/status/gpm-uninhibit.png           | Bin
 {netspeed => data}/icons/Makefile.am               |   0
 .../48x48 => data/icons/scalable}/Makefile.am      |   0
 data/icons/scalable/apps/Makefile.am               |  24 +++++++
 .../scalable/apps/gnome-brightness-applet.svg      |   0
 .../icons/scalable/apps/gnome-inhibit-applet.svg   |   0
 .../icons/scalable/apps/netspeed-applet.svg        |   0
 data/icons/scalable/status/Makefile.am             |  22 ++++++
 .../status/gpm-brightness-lcd-disabled.svg         |   0
 .../scalable/status/gpm-brightness-lcd-invalid.svg |   0
 .../icons/scalable/status/gpm-brightness-lcd.svg   |   0
 .../icons/scalable/status/gpm-inhibit-invalid.svg  |   0
 .../icons/scalable/status/gpm-inhibit.svg          |   0
 .../icons/scalable/status/gpm-uninhibit.svg        |   0
 {netspeed => data}/icons/svg-source/netspeed.svg   |   0
 inhibit/Makefile.am                                |   2 +-
 inhibit/icons/16x16/Makefile.am                    |   3 -
 inhibit/icons/16x16/apps/Makefile.am               |  16 -----
 inhibit/icons/16x16/status/Makefile.am             |  19 ------
 inhibit/icons/22x22/Makefile.am                    |   3 -
 inhibit/icons/22x22/apps/Makefile.am               |  16 -----
 inhibit/icons/22x22/status/Makefile.am             |  19 ------
 inhibit/icons/24x24/Makefile.am                    |   3 -
 inhibit/icons/24x24/apps/Makefile.am               |  16 -----
 inhibit/icons/24x24/status/Makefile.am             |  19 ------
 inhibit/icons/32x32/Makefile.am                    |   3 -
 inhibit/icons/32x32/apps/Makefile.am               |  16 -----
 inhibit/icons/32x32/status/Makefile.am             |  19 ------
 inhibit/icons/48x48/Makefile.am                    |   3 -
 inhibit/icons/48x48/apps/Makefile.am               |  16 -----
 inhibit/icons/48x48/status/Makefile.am             |  19 ------
 inhibit/icons/Makefile.am                          |  16 -----
 inhibit/icons/scalable/Makefile.am                 |   3 -
 inhibit/icons/scalable/apps/Makefile.am            |  16 -----
 inhibit/icons/scalable/status/Makefile.am          |  19 ------
 netspeed/Makefile.am                               |   2 +-
 netspeed/icons/16x16/apps/Makefile.am              |  13 ----
 netspeed/icons/16x16/status/Makefile.am            |  16 -----
 netspeed/icons/22x22/Makefile.am                   |   4 --
 netspeed/icons/22x22/apps/Makefile.am              |  13 ----
 netspeed/icons/24x24/Makefile.am                   |   4 --
 netspeed/icons/24x24/apps/Makefile.am              |  13 ----
 netspeed/icons/32x32/Makefile.am                   |   4 --
 netspeed/icons/32x32/apps/Makefile.am              |  13 ----
 netspeed/icons/48x48/Makefile.am                   |   4 --
 netspeed/icons/48x48/apps/Makefile.am              |  14 ----
 netspeed/icons/scalable/Makefile.am                |   4 --
 netspeed/icons/scalable/apps/Makefile.am           |  17 -----
 133 files changed, 331 insertions(+), 646 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ccf0c2c75..ab443705a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ always_built_SUBDIRS =  \
        $(NULL)
 
 SUBDIRS = \
+       data \
        help \
        po                      \
        $(always_built_SUBDIRS) \
@@ -65,6 +66,7 @@ SUBDIRS = \
        $(NULL)
 
 DIST_SUBDIRS = \
+       data \
        help \
        po              \
        drivemount      \
diff --git a/brightness/Makefile.am b/brightness/Makefile.am
index 34ad9d6a8..c28e99410 100644
--- a/brightness/Makefile.am
+++ b/brightness/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS = icons src
+SUBDIRS = src
 
 APPLET_LOCATION = $(pkglibdir)/libbrightness-applet.so
 
diff --git a/configure.ac b/configure.ac
index 90b4198eb..e13c4f547 100644
--- a/configure.ac
+++ b/configure.ac
@@ -525,6 +525,28 @@ dnl **************************************************************************
 AC_CONFIG_FILES([
   Makefile
 
+  data/Makefile
+  data/icons/Makefile
+  data/icons/16x16/Makefile
+  data/icons/16x16/apps/Makefile
+  data/icons/16x16/devices/Makefile
+  data/icons/16x16/status/Makefile
+  data/icons/22x22/Makefile
+  data/icons/22x22/apps/Makefile
+  data/icons/22x22/status/Makefile
+  data/icons/24x24/Makefile
+  data/icons/24x24/apps/Makefile
+  data/icons/24x24/status/Makefile
+  data/icons/32x32/Makefile
+  data/icons/32x32/apps/Makefile
+  data/icons/32x32/status/Makefile
+  data/icons/48x48/Makefile
+  data/icons/48x48/apps/Makefile
+  data/icons/48x48/status/Makefile
+  data/icons/scalable/Makefile
+  data/icons/scalable/apps/Makefile
+  data/icons/scalable/status/Makefile
+
   help/Makefile
   help/accessx-status/Makefile
   help/battstat/Makefile
@@ -551,25 +573,6 @@ AC_CONFIG_FILES([
   battstat/src/apmlib/Makefile
 
   brightness/Makefile
-  brightness/icons/Makefile
-  brightness/icons/16x16/Makefile
-  brightness/icons/16x16/apps/Makefile
-  brightness/icons/16x16/status/Makefile
-  brightness/icons/22x22/Makefile
-  brightness/icons/22x22/apps/Makefile
-  brightness/icons/22x22/status/Makefile
-  brightness/icons/24x24/Makefile
-  brightness/icons/24x24/apps/Makefile
-  brightness/icons/24x24/status/Makefile
-  brightness/icons/32x32/Makefile
-  brightness/icons/32x32/apps/Makefile
-  brightness/icons/32x32/status/Makefile
-  brightness/icons/48x48/Makefile
-  brightness/icons/48x48/apps/Makefile
-  brightness/icons/48x48/status/Makefile
-  brightness/icons/scalable/Makefile
-  brightness/icons/scalable/apps/Makefile
-  brightness/icons/scalable/status/Makefile
   brightness/src/Makefile
 
   charpick/Makefile
@@ -587,25 +590,6 @@ AC_CONFIG_FILES([
   drivemount/src/Makefile
 
   inhibit/Makefile
-  inhibit/icons/Makefile
-  inhibit/icons/16x16/Makefile
-  inhibit/icons/16x16/apps/Makefile
-  inhibit/icons/16x16/status/Makefile
-  inhibit/icons/22x22/Makefile
-  inhibit/icons/22x22/apps/Makefile
-  inhibit/icons/22x22/status/Makefile
-  inhibit/icons/24x24/Makefile
-  inhibit/icons/24x24/apps/Makefile
-  inhibit/icons/24x24/status/Makefile
-  inhibit/icons/32x32/Makefile
-  inhibit/icons/32x32/apps/Makefile
-  inhibit/icons/32x32/status/Makefile
-  inhibit/icons/48x48/Makefile
-  inhibit/icons/48x48/apps/Makefile
-  inhibit/icons/48x48/status/Makefile
-  inhibit/icons/scalable/Makefile
-  inhibit/icons/scalable/apps/Makefile
-  inhibit/icons/scalable/status/Makefile
   inhibit/src/Makefile
 
   geyes/Makefile
@@ -622,21 +606,6 @@ AC_CONFIG_FILES([
   multiload/src/Makefile
 
   netspeed/data/Makefile
-  netspeed/icons/Makefile
-  netspeed/icons/16x16/Makefile
-  netspeed/icons/16x16/apps/Makefile
-  netspeed/icons/16x16/devices/Makefile
-  netspeed/icons/16x16/status/Makefile
-  netspeed/icons/22x22/Makefile
-  netspeed/icons/22x22/apps/Makefile
-  netspeed/icons/24x24/Makefile
-  netspeed/icons/24x24/apps/Makefile
-  netspeed/icons/32x32/Makefile
-  netspeed/icons/32x32/apps/Makefile
-  netspeed/icons/48x48/Makefile
-  netspeed/icons/48x48/apps/Makefile
-  netspeed/icons/scalable/Makefile
-  netspeed/icons/scalable/apps/Makefile
   netspeed/src/Makefile
   netspeed/Makefile
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 000000000..ddb028172
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,7 @@
+NULL =
+
+SUBDIRS = \
+       icons \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/netspeed/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
similarity index 98%
rename from netspeed/icons/16x16/Makefile.am
rename to data/icons/16x16/Makefile.am
index dfde3f106..d45e98a83 100644
--- a/netspeed/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = apps devices status
 
-
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
new file mode 100644
index 000000000..f9e07f7d9
--- /dev/null
+++ b/data/icons/16x16/apps/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+themedir = $(datadir)/icons/hicolor
+size = 16x16
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gnome-brightness-applet.png \
+       gnome-inhibit-applet.png \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
+icons_DATA += \
+       netspeed-applet.png \
+       $(NULL)
+endif
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/16x16/apps/gnome-brightness-applet.png 
b/data/icons/16x16/apps/gnome-brightness-applet.png
similarity index 100%
rename from brightness/icons/16x16/apps/gnome-brightness-applet.png
rename to data/icons/16x16/apps/gnome-brightness-applet.png
diff --git a/inhibit/icons/16x16/apps/gnome-inhibit-applet.png 
b/data/icons/16x16/apps/gnome-inhibit-applet.png
similarity index 100%
rename from inhibit/icons/16x16/apps/gnome-inhibit-applet.png
rename to data/icons/16x16/apps/gnome-inhibit-applet.png
diff --git a/netspeed/icons/16x16/apps/netspeed-applet.png b/data/icons/16x16/apps/netspeed-applet.png
similarity index 100%
rename from netspeed/icons/16x16/apps/netspeed-applet.png
rename to data/icons/16x16/apps/netspeed-applet.png
diff --git a/netspeed/icons/16x16/devices/Makefile.am b/data/icons/16x16/devices/Makefile.am
similarity index 60%
rename from netspeed/icons/16x16/devices/Makefile.am
rename to data/icons/16x16/devices/Makefile.am
index 09a9d4f99..1fca41f5b 100644
--- a/netspeed/icons/16x16/devices/Makefile.am
+++ b/data/icons/16x16/devices/Makefile.am
@@ -1,15 +1,24 @@
+NULL =
+
 themedir = $(datadir)/icons/hicolor
 size = 16x16
 context = devices
 
 iconsdir = $(themedir)/$(size)/$(context)
 
+icons_DATA = \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
 icons_DATA = \
        netspeed-loopback.png \
        netspeed-plip.png \
-       netspeed-ppp.png 
+       netspeed-ppp.png \
+       $(NULL)
+endif
 
-EXTRA_DIST =           \
-       $(icons_DATA)
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/netspeed/icons/16x16/devices/netspeed-loopback.png 
b/data/icons/16x16/devices/netspeed-loopback.png
similarity index 100%
rename from netspeed/icons/16x16/devices/netspeed-loopback.png
rename to data/icons/16x16/devices/netspeed-loopback.png
diff --git a/netspeed/icons/16x16/devices/netspeed-plip.png b/data/icons/16x16/devices/netspeed-plip.png
similarity index 100%
rename from netspeed/icons/16x16/devices/netspeed-plip.png
rename to data/icons/16x16/devices/netspeed-plip.png
diff --git a/netspeed/icons/16x16/devices/netspeed-ppp.png b/data/icons/16x16/devices/netspeed-ppp.png
similarity index 100%
rename from netspeed/icons/16x16/devices/netspeed-ppp.png
rename to data/icons/16x16/devices/netspeed-ppp.png
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
new file mode 100644
index 000000000..b98b0f6f2
--- /dev/null
+++ b/data/icons/16x16/status/Makefile.am
@@ -0,0 +1,31 @@
+NULL =
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 16x16
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gpm-brightness-lcd.png \
+       gpm-brightness-lcd-disabled.png \
+       gpm-brightness-lcd-invalid.png \
+       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) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/16x16/status/gpm-brightness-lcd-disabled.png 
b/data/icons/16x16/status/gpm-brightness-lcd-disabled.png
similarity index 100%
rename from brightness/icons/16x16/status/gpm-brightness-lcd-disabled.png
rename to data/icons/16x16/status/gpm-brightness-lcd-disabled.png
diff --git a/brightness/icons/16x16/status/gpm-brightness-lcd-invalid.png 
b/data/icons/16x16/status/gpm-brightness-lcd-invalid.png
similarity index 100%
rename from brightness/icons/16x16/status/gpm-brightness-lcd-invalid.png
rename to data/icons/16x16/status/gpm-brightness-lcd-invalid.png
diff --git a/brightness/icons/16x16/status/gpm-brightness-lcd.png 
b/data/icons/16x16/status/gpm-brightness-lcd.png
similarity index 100%
rename from brightness/icons/16x16/status/gpm-brightness-lcd.png
rename to data/icons/16x16/status/gpm-brightness-lcd.png
diff --git a/inhibit/icons/16x16/status/gpm-inhibit-invalid.png 
b/data/icons/16x16/status/gpm-inhibit-invalid.png
similarity index 100%
rename from inhibit/icons/16x16/status/gpm-inhibit-invalid.png
rename to data/icons/16x16/status/gpm-inhibit-invalid.png
diff --git a/inhibit/icons/16x16/status/gpm-inhibit.png b/data/icons/16x16/status/gpm-inhibit.png
similarity index 100%
rename from inhibit/icons/16x16/status/gpm-inhibit.png
rename to data/icons/16x16/status/gpm-inhibit.png
diff --git a/inhibit/icons/16x16/status/gpm-uninhibit.png b/data/icons/16x16/status/gpm-uninhibit.png
similarity index 100%
rename from inhibit/icons/16x16/status/gpm-uninhibit.png
rename to data/icons/16x16/status/gpm-uninhibit.png
diff --git a/netspeed/icons/16x16/status/netspeed-wireless-100.png 
b/data/icons/16x16/status/netspeed-wireless-100.png
similarity index 100%
rename from netspeed/icons/16x16/status/netspeed-wireless-100.png
rename to data/icons/16x16/status/netspeed-wireless-100.png
diff --git a/netspeed/icons/16x16/status/netspeed-wireless-25.png 
b/data/icons/16x16/status/netspeed-wireless-25.png
similarity index 100%
rename from netspeed/icons/16x16/status/netspeed-wireless-25.png
rename to data/icons/16x16/status/netspeed-wireless-25.png
diff --git a/netspeed/icons/16x16/status/netspeed-wireless-50.png 
b/data/icons/16x16/status/netspeed-wireless-50.png
similarity index 100%
rename from netspeed/icons/16x16/status/netspeed-wireless-50.png
rename to data/icons/16x16/status/netspeed-wireless-50.png
diff --git a/netspeed/icons/16x16/status/netspeed-wireless-75.png 
b/data/icons/16x16/status/netspeed-wireless-75.png
similarity index 100%
rename from netspeed/icons/16x16/status/netspeed-wireless-75.png
rename to data/icons/16x16/status/netspeed-wireless-75.png
diff --git a/brightness/icons/16x16/Makefile.am b/data/icons/22x22/Makefile.am
similarity index 100%
rename from brightness/icons/16x16/Makefile.am
rename to data/icons/22x22/Makefile.am
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
new file mode 100644
index 000000000..b0493b552
--- /dev/null
+++ b/data/icons/22x22/apps/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+themedir = $(datadir)/icons/hicolor
+size = 22x22
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gnome-brightness-applet.png \
+       gnome-inhibit-applet.png \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
+icons_DATA += \
+       netspeed-applet.png \
+       $(NULL)
+endif
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/22x22/apps/gnome-brightness-applet.png 
b/data/icons/22x22/apps/gnome-brightness-applet.png
similarity index 100%
rename from brightness/icons/22x22/apps/gnome-brightness-applet.png
rename to data/icons/22x22/apps/gnome-brightness-applet.png
diff --git a/inhibit/icons/22x22/apps/gnome-inhibit-applet.png 
b/data/icons/22x22/apps/gnome-inhibit-applet.png
similarity index 100%
rename from inhibit/icons/22x22/apps/gnome-inhibit-applet.png
rename to data/icons/22x22/apps/gnome-inhibit-applet.png
diff --git a/netspeed/icons/22x22/apps/netspeed-applet.png b/data/icons/22x22/apps/netspeed-applet.png
similarity index 100%
rename from netspeed/icons/22x22/apps/netspeed-applet.png
rename to data/icons/22x22/apps/netspeed-applet.png
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
new file mode 100644
index 000000000..ae3ec5161
--- /dev/null
+++ b/data/icons/22x22/status/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 22x22
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gpm-brightness-lcd.png \
+       gpm-brightness-lcd-disabled.png \
+       gpm-brightness-lcd-invalid.png \
+       gpm-inhibit.png \
+       gpm-inhibit-invalid.png \
+       gpm-uninhibit.png \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/22x22/status/gpm-brightness-lcd-disabled.png 
b/data/icons/22x22/status/gpm-brightness-lcd-disabled.png
similarity index 100%
rename from brightness/icons/22x22/status/gpm-brightness-lcd-disabled.png
rename to data/icons/22x22/status/gpm-brightness-lcd-disabled.png
diff --git a/brightness/icons/22x22/status/gpm-brightness-lcd-invalid.png 
b/data/icons/22x22/status/gpm-brightness-lcd-invalid.png
similarity index 100%
rename from brightness/icons/22x22/status/gpm-brightness-lcd-invalid.png
rename to data/icons/22x22/status/gpm-brightness-lcd-invalid.png
diff --git a/brightness/icons/22x22/status/gpm-brightness-lcd.png 
b/data/icons/22x22/status/gpm-brightness-lcd.png
similarity index 100%
rename from brightness/icons/22x22/status/gpm-brightness-lcd.png
rename to data/icons/22x22/status/gpm-brightness-lcd.png
diff --git a/inhibit/icons/22x22/status/gpm-inhibit-invalid.png 
b/data/icons/22x22/status/gpm-inhibit-invalid.png
similarity index 100%
rename from inhibit/icons/22x22/status/gpm-inhibit-invalid.png
rename to data/icons/22x22/status/gpm-inhibit-invalid.png
diff --git a/inhibit/icons/22x22/status/gpm-inhibit.png b/data/icons/22x22/status/gpm-inhibit.png
similarity index 100%
rename from inhibit/icons/22x22/status/gpm-inhibit.png
rename to data/icons/22x22/status/gpm-inhibit.png
diff --git a/inhibit/icons/22x22/status/gpm-uninhibit.png b/data/icons/22x22/status/gpm-uninhibit.png
similarity index 100%
rename from inhibit/icons/22x22/status/gpm-uninhibit.png
rename to data/icons/22x22/status/gpm-uninhibit.png
diff --git a/brightness/icons/22x22/Makefile.am b/data/icons/24x24/Makefile.am
similarity index 100%
rename from brightness/icons/22x22/Makefile.am
rename to data/icons/24x24/Makefile.am
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
new file mode 100644
index 000000000..c7ce438f6
--- /dev/null
+++ b/data/icons/24x24/apps/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+themedir = $(datadir)/icons/hicolor
+size = 24x24
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gnome-brightness-applet.png \
+       gnome-inhibit-applet.png \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
+icons_DATA += \
+       netspeed-applet.png \
+       $(NULL)
+endif
+
+EXTRA_DIST = \
+       $(icons_DATA)   \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/24x24/apps/gnome-brightness-applet.png 
b/data/icons/24x24/apps/gnome-brightness-applet.png
similarity index 100%
rename from brightness/icons/24x24/apps/gnome-brightness-applet.png
rename to data/icons/24x24/apps/gnome-brightness-applet.png
diff --git a/inhibit/icons/24x24/apps/gnome-inhibit-applet.png 
b/data/icons/24x24/apps/gnome-inhibit-applet.png
similarity index 100%
rename from inhibit/icons/24x24/apps/gnome-inhibit-applet.png
rename to data/icons/24x24/apps/gnome-inhibit-applet.png
diff --git a/netspeed/icons/24x24/apps/netspeed-applet.png b/data/icons/24x24/apps/netspeed-applet.png
similarity index 100%
rename from netspeed/icons/24x24/apps/netspeed-applet.png
rename to data/icons/24x24/apps/netspeed-applet.png
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
new file mode 100644
index 000000000..f3d3d2e73
--- /dev/null
+++ b/data/icons/24x24/status/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 24x24
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gpm-brightness-lcd.png \
+       gpm-brightness-lcd-disabled.png \
+       gpm-brightness-lcd-invalid.png \
+       gpm-inhibit.png \
+       gpm-inhibit-invalid.png \
+       gpm-uninhibit.png \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/24x24/status/gpm-brightness-lcd-disabled.png 
b/data/icons/24x24/status/gpm-brightness-lcd-disabled.png
similarity index 100%
rename from brightness/icons/24x24/status/gpm-brightness-lcd-disabled.png
rename to data/icons/24x24/status/gpm-brightness-lcd-disabled.png
diff --git a/brightness/icons/24x24/status/gpm-brightness-lcd-invalid.png 
b/data/icons/24x24/status/gpm-brightness-lcd-invalid.png
similarity index 100%
rename from brightness/icons/24x24/status/gpm-brightness-lcd-invalid.png
rename to data/icons/24x24/status/gpm-brightness-lcd-invalid.png
diff --git a/brightness/icons/24x24/status/gpm-brightness-lcd.png 
b/data/icons/24x24/status/gpm-brightness-lcd.png
similarity index 100%
rename from brightness/icons/24x24/status/gpm-brightness-lcd.png
rename to data/icons/24x24/status/gpm-brightness-lcd.png
diff --git a/inhibit/icons/24x24/status/gpm-inhibit-invalid.png 
b/data/icons/24x24/status/gpm-inhibit-invalid.png
similarity index 100%
rename from inhibit/icons/24x24/status/gpm-inhibit-invalid.png
rename to data/icons/24x24/status/gpm-inhibit-invalid.png
diff --git a/inhibit/icons/24x24/status/gpm-inhibit.png b/data/icons/24x24/status/gpm-inhibit.png
similarity index 100%
rename from inhibit/icons/24x24/status/gpm-inhibit.png
rename to data/icons/24x24/status/gpm-inhibit.png
diff --git a/inhibit/icons/24x24/status/gpm-uninhibit.png b/data/icons/24x24/status/gpm-uninhibit.png
similarity index 100%
rename from inhibit/icons/24x24/status/gpm-uninhibit.png
rename to data/icons/24x24/status/gpm-uninhibit.png
diff --git a/brightness/icons/24x24/Makefile.am b/data/icons/32x32/Makefile.am
similarity index 100%
rename from brightness/icons/24x24/Makefile.am
rename to data/icons/32x32/Makefile.am
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
new file mode 100644
index 000000000..1af9978a6
--- /dev/null
+++ b/data/icons/32x32/apps/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+themedir = $(datadir)/icons/hicolor
+size = 32x32
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gnome-brightness-applet.png \
+       gnome-inhibit-applet.png \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
+icons_DATA += \
+       netspeed-applet.png \
+       $(NULL)
+endif
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/32x32/apps/gnome-brightness-applet.png 
b/data/icons/32x32/apps/gnome-brightness-applet.png
similarity index 100%
rename from brightness/icons/32x32/apps/gnome-brightness-applet.png
rename to data/icons/32x32/apps/gnome-brightness-applet.png
diff --git a/inhibit/icons/32x32/apps/gnome-inhibit-applet.png 
b/data/icons/32x32/apps/gnome-inhibit-applet.png
similarity index 100%
rename from inhibit/icons/32x32/apps/gnome-inhibit-applet.png
rename to data/icons/32x32/apps/gnome-inhibit-applet.png
diff --git a/netspeed/icons/32x32/apps/netspeed-applet.png b/data/icons/32x32/apps/netspeed-applet.png
similarity index 100%
rename from netspeed/icons/32x32/apps/netspeed-applet.png
rename to data/icons/32x32/apps/netspeed-applet.png
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
new file mode 100644
index 000000000..6492bc2cd
--- /dev/null
+++ b/data/icons/32x32/status/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 32x32
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gpm-brightness-lcd.png \
+       gpm-brightness-lcd-disabled.png \
+       gpm-brightness-lcd-invalid.png \
+       gpm-inhibit.png \
+       gpm-inhibit-invalid.png \
+       gpm-uninhibit.png \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/32x32/status/gpm-brightness-lcd-disabled.png 
b/data/icons/32x32/status/gpm-brightness-lcd-disabled.png
similarity index 100%
rename from brightness/icons/32x32/status/gpm-brightness-lcd-disabled.png
rename to data/icons/32x32/status/gpm-brightness-lcd-disabled.png
diff --git a/brightness/icons/32x32/status/gpm-brightness-lcd-invalid.png 
b/data/icons/32x32/status/gpm-brightness-lcd-invalid.png
similarity index 100%
rename from brightness/icons/32x32/status/gpm-brightness-lcd-invalid.png
rename to data/icons/32x32/status/gpm-brightness-lcd-invalid.png
diff --git a/brightness/icons/32x32/status/gpm-brightness-lcd.png 
b/data/icons/32x32/status/gpm-brightness-lcd.png
similarity index 100%
rename from brightness/icons/32x32/status/gpm-brightness-lcd.png
rename to data/icons/32x32/status/gpm-brightness-lcd.png
diff --git a/inhibit/icons/32x32/status/gpm-inhibit-invalid.png 
b/data/icons/32x32/status/gpm-inhibit-invalid.png
similarity index 100%
rename from inhibit/icons/32x32/status/gpm-inhibit-invalid.png
rename to data/icons/32x32/status/gpm-inhibit-invalid.png
diff --git a/inhibit/icons/32x32/status/gpm-inhibit.png b/data/icons/32x32/status/gpm-inhibit.png
similarity index 100%
rename from inhibit/icons/32x32/status/gpm-inhibit.png
rename to data/icons/32x32/status/gpm-inhibit.png
diff --git a/inhibit/icons/32x32/status/gpm-uninhibit.png b/data/icons/32x32/status/gpm-uninhibit.png
similarity index 100%
rename from inhibit/icons/32x32/status/gpm-uninhibit.png
rename to data/icons/32x32/status/gpm-uninhibit.png
diff --git a/brightness/icons/32x32/Makefile.am b/data/icons/48x48/Makefile.am
similarity index 100%
rename from brightness/icons/32x32/Makefile.am
rename to data/icons/48x48/Makefile.am
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
new file mode 100644
index 000000000..62f727887
--- /dev/null
+++ b/data/icons/48x48/apps/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+themedir = $(datadir)/icons/hicolor
+size = 48x48
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gnome-brightness-applet.png \
+       gnome-inhibit-applet.png \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
+icons_DATA += \
+       netspeed-applet.png \
+       $(NULL)
+endif
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/48x48/apps/gnome-brightness-applet.png 
b/data/icons/48x48/apps/gnome-brightness-applet.png
similarity index 100%
rename from brightness/icons/48x48/apps/gnome-brightness-applet.png
rename to data/icons/48x48/apps/gnome-brightness-applet.png
diff --git a/inhibit/icons/48x48/apps/gnome-inhibit-applet.png 
b/data/icons/48x48/apps/gnome-inhibit-applet.png
similarity index 100%
rename from inhibit/icons/48x48/apps/gnome-inhibit-applet.png
rename to data/icons/48x48/apps/gnome-inhibit-applet.png
diff --git a/netspeed/icons/48x48/apps/netspeed-applet.png b/data/icons/48x48/apps/netspeed-applet.png
similarity index 100%
rename from netspeed/icons/48x48/apps/netspeed-applet.png
rename to data/icons/48x48/apps/netspeed-applet.png
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
new file mode 100644
index 000000000..9889275e2
--- /dev/null
+++ b/data/icons/48x48/status/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 48x48
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gpm-brightness-lcd.png \
+       gpm-brightness-lcd-disabled.png \
+       gpm-brightness-lcd-invalid.png \
+       gpm-inhibit.png \
+       gpm-inhibit-invalid.png \
+       gpm-uninhibit.png \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/48x48/status/gpm-brightness-lcd-disabled.png 
b/data/icons/48x48/status/gpm-brightness-lcd-disabled.png
similarity index 100%
rename from brightness/icons/48x48/status/gpm-brightness-lcd-disabled.png
rename to data/icons/48x48/status/gpm-brightness-lcd-disabled.png
diff --git a/brightness/icons/48x48/status/gpm-brightness-lcd-invalid.png 
b/data/icons/48x48/status/gpm-brightness-lcd-invalid.png
similarity index 100%
rename from brightness/icons/48x48/status/gpm-brightness-lcd-invalid.png
rename to data/icons/48x48/status/gpm-brightness-lcd-invalid.png
diff --git a/brightness/icons/48x48/status/gpm-brightness-lcd.png 
b/data/icons/48x48/status/gpm-brightness-lcd.png
similarity index 100%
rename from brightness/icons/48x48/status/gpm-brightness-lcd.png
rename to data/icons/48x48/status/gpm-brightness-lcd.png
diff --git a/inhibit/icons/48x48/status/gpm-inhibit-invalid.png 
b/data/icons/48x48/status/gpm-inhibit-invalid.png
similarity index 100%
rename from inhibit/icons/48x48/status/gpm-inhibit-invalid.png
rename to data/icons/48x48/status/gpm-inhibit-invalid.png
diff --git a/inhibit/icons/48x48/status/gpm-inhibit.png b/data/icons/48x48/status/gpm-inhibit.png
similarity index 100%
rename from inhibit/icons/48x48/status/gpm-inhibit.png
rename to data/icons/48x48/status/gpm-inhibit.png
diff --git a/inhibit/icons/48x48/status/gpm-uninhibit.png b/data/icons/48x48/status/gpm-uninhibit.png
similarity index 100%
rename from inhibit/icons/48x48/status/gpm-uninhibit.png
rename to data/icons/48x48/status/gpm-uninhibit.png
diff --git a/netspeed/icons/Makefile.am b/data/icons/Makefile.am
similarity index 100%
rename from netspeed/icons/Makefile.am
rename to data/icons/Makefile.am
diff --git a/brightness/icons/48x48/Makefile.am b/data/icons/scalable/Makefile.am
similarity index 100%
rename from brightness/icons/48x48/Makefile.am
rename to data/icons/scalable/Makefile.am
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
new file mode 100644
index 000000000..dd511831f
--- /dev/null
+++ b/data/icons/scalable/apps/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+themedir = $(datadir)/icons/hicolor
+size = scalable
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gnome-brightness-applet.svg \
+       gnome-inhibit-applet.svg \
+       $(NULL)
+
+if BUILD_GTOP_APPLETS
+icons_DATA += \
+       netspeed-applet.svg \
+       $(NULL)
+endif
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/scalable/apps/gnome-brightness-applet.svg 
b/data/icons/scalable/apps/gnome-brightness-applet.svg
similarity index 100%
rename from brightness/icons/scalable/apps/gnome-brightness-applet.svg
rename to data/icons/scalable/apps/gnome-brightness-applet.svg
diff --git a/inhibit/icons/scalable/apps/gnome-inhibit-applet.svg 
b/data/icons/scalable/apps/gnome-inhibit-applet.svg
similarity index 100%
rename from inhibit/icons/scalable/apps/gnome-inhibit-applet.svg
rename to data/icons/scalable/apps/gnome-inhibit-applet.svg
diff --git a/netspeed/icons/scalable/apps/netspeed-applet.svg b/data/icons/scalable/apps/netspeed-applet.svg
similarity index 100%
rename from netspeed/icons/scalable/apps/netspeed-applet.svg
rename to data/icons/scalable/apps/netspeed-applet.svg
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
new file mode 100644
index 000000000..e6f1b2fe8
--- /dev/null
+++ b/data/icons/scalable/status/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = scalable
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+       gpm-brightness-lcd.svg \
+       gpm-brightness-lcd-disabled.svg \
+       gpm-brightness-lcd-invalid.svg \
+       gpm-inhibit.svg \
+       gpm-inhibit-invalid.svg \
+       gpm-uninhibit.svg \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(icons_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/icons/scalable/status/gpm-brightness-lcd-disabled.svg 
b/data/icons/scalable/status/gpm-brightness-lcd-disabled.svg
similarity index 100%
rename from brightness/icons/scalable/status/gpm-brightness-lcd-disabled.svg
rename to data/icons/scalable/status/gpm-brightness-lcd-disabled.svg
diff --git a/brightness/icons/scalable/status/gpm-brightness-lcd-invalid.svg 
b/data/icons/scalable/status/gpm-brightness-lcd-invalid.svg
similarity index 100%
rename from brightness/icons/scalable/status/gpm-brightness-lcd-invalid.svg
rename to data/icons/scalable/status/gpm-brightness-lcd-invalid.svg
diff --git a/brightness/icons/scalable/status/gpm-brightness-lcd.svg 
b/data/icons/scalable/status/gpm-brightness-lcd.svg
similarity index 100%
rename from brightness/icons/scalable/status/gpm-brightness-lcd.svg
rename to data/icons/scalable/status/gpm-brightness-lcd.svg
diff --git a/inhibit/icons/scalable/status/gpm-inhibit-invalid.svg 
b/data/icons/scalable/status/gpm-inhibit-invalid.svg
similarity index 100%
rename from inhibit/icons/scalable/status/gpm-inhibit-invalid.svg
rename to data/icons/scalable/status/gpm-inhibit-invalid.svg
diff --git a/inhibit/icons/scalable/status/gpm-inhibit.svg b/data/icons/scalable/status/gpm-inhibit.svg
similarity index 100%
rename from inhibit/icons/scalable/status/gpm-inhibit.svg
rename to data/icons/scalable/status/gpm-inhibit.svg
diff --git a/inhibit/icons/scalable/status/gpm-uninhibit.svg b/data/icons/scalable/status/gpm-uninhibit.svg
similarity index 100%
rename from inhibit/icons/scalable/status/gpm-uninhibit.svg
rename to data/icons/scalable/status/gpm-uninhibit.svg
diff --git a/netspeed/icons/svg-source/netspeed.svg b/data/icons/svg-source/netspeed.svg
similarity index 100%
rename from netspeed/icons/svg-source/netspeed.svg
rename to data/icons/svg-source/netspeed.svg
diff --git a/inhibit/Makefile.am b/inhibit/Makefile.am
index 4f75beb85..4ee4cd2f7 100644
--- a/inhibit/Makefile.am
+++ b/inhibit/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS = icons src
+SUBDIRS = src
 
 APPLET_LOCATION=$(pkglibdir)/libinhibit-applet.so
 
diff --git a/netspeed/Makefile.am b/netspeed/Makefile.am
index 47ec727bd..5d55ad08a 100644
--- a/netspeed/Makefile.am
+++ b/netspeed/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = data icons src
+SUBDIRS = data src
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]