From 2412123fbcb1b766aec81cb3cf4c93a3c6c4ed84 Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 29 Jul 2020 13:53:32 +0200 Subject: netspeed: Simplify icons/Makefile.am --- netspeed/icons/16x16/Makefile.am | 4 ---- netspeed/icons/16x16/apps/Makefile.am | 13 ------------- netspeed/icons/16x16/devices/Makefile.am | 13 ------------- netspeed/icons/22x22/Makefile.am | 4 ---- netspeed/icons/22x22/apps/Makefile.am | 13 ------------- netspeed/icons/22x22/devices/Makefile.am | 13 ------------- netspeed/icons/24x24/Makefile.am | 4 ---- netspeed/icons/24x24/apps/Makefile.am | 13 ------------- netspeed/icons/24x24/devices/Makefile.am | 13 ------------- netspeed/icons/24x24/status/Makefile.am | 16 ---------------- netspeed/icons/32x32/Makefile.am | 4 ---- netspeed/icons/32x32/apps/Makefile.am | 13 ------------- netspeed/icons/32x32/devices/Makefile.am | 13 ------------- netspeed/icons/48x48/Makefile.am | 4 ---- netspeed/icons/48x48/apps/Makefile.am | 14 -------------- netspeed/icons/48x48/devices/Makefile.am | 13 ------------- netspeed/icons/Makefile.am | 28 ++++++++++++++++++++++++++-- netspeed/icons/scalable/Makefile.am | 4 ---- netspeed/icons/scalable/apps/Makefile.am | 17 ----------------- 19 files changed, 26 insertions(+), 190 deletions(-) delete mode 100644 netspeed/icons/16x16/Makefile.am delete mode 100644 netspeed/icons/16x16/apps/Makefile.am delete mode 100644 netspeed/icons/16x16/devices/Makefile.am delete mode 100644 netspeed/icons/22x22/Makefile.am delete mode 100644 netspeed/icons/22x22/apps/Makefile.am delete mode 100644 netspeed/icons/22x22/devices/Makefile.am delete mode 100644 netspeed/icons/24x24/Makefile.am delete mode 100644 netspeed/icons/24x24/apps/Makefile.am delete mode 100644 netspeed/icons/24x24/devices/Makefile.am delete mode 100644 netspeed/icons/24x24/status/Makefile.am delete mode 100644 netspeed/icons/32x32/Makefile.am delete mode 100644 netspeed/icons/32x32/apps/Makefile.am delete mode 100644 netspeed/icons/32x32/devices/Makefile.am delete mode 100644 netspeed/icons/48x48/Makefile.am delete mode 100644 netspeed/icons/48x48/apps/Makefile.am delete mode 100644 netspeed/icons/48x48/devices/Makefile.am delete mode 100644 netspeed/icons/scalable/Makefile.am delete mode 100644 netspeed/icons/scalable/apps/Makefile.am (limited to 'netspeed') diff --git a/netspeed/icons/16x16/Makefile.am b/netspeed/icons/16x16/Makefile.am deleted file mode 100644 index eb00566d..00000000 --- a/netspeed/icons/16x16/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = apps devices - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/16x16/apps/Makefile.am b/netspeed/icons/16x16/apps/Makefile.am deleted file mode 100644 index 92696198..00000000 --- a/netspeed/icons/16x16/apps/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 16x16 -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-applet.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/16x16/devices/Makefile.am b/netspeed/icons/16x16/devices/Makefile.am deleted file mode 100644 index 653f0847..00000000 --- a/netspeed/icons/16x16/devices/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 16x16 -context = devices - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-plip.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/22x22/Makefile.am b/netspeed/icons/22x22/Makefile.am deleted file mode 100644 index eb00566d..00000000 --- a/netspeed/icons/22x22/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = apps devices - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/22x22/apps/Makefile.am b/netspeed/icons/22x22/apps/Makefile.am deleted file mode 100644 index 9c16c9f4..00000000 --- a/netspeed/icons/22x22/apps/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 22x22 -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-applet.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/22x22/devices/Makefile.am b/netspeed/icons/22x22/devices/Makefile.am deleted file mode 100644 index 46451c5e..00000000 --- a/netspeed/icons/22x22/devices/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 22x22 -context = devices - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-plip.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/24x24/Makefile.am b/netspeed/icons/24x24/Makefile.am deleted file mode 100644 index dfde3f10..00000000 --- a/netspeed/icons/24x24/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = apps devices status - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/24x24/apps/Makefile.am b/netspeed/icons/24x24/apps/Makefile.am deleted file mode 100644 index 9b3057bf..00000000 --- a/netspeed/icons/24x24/apps/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 24x24 -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-applet.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/24x24/devices/Makefile.am b/netspeed/icons/24x24/devices/Makefile.am deleted file mode 100644 index ea5b03e8..00000000 --- a/netspeed/icons/24x24/devices/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 24x24 -context = devices - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-plip.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/24x24/status/Makefile.am b/netspeed/icons/24x24/status/Makefile.am deleted file mode 100644 index 3f6bd360..00000000 --- a/netspeed/icons/24x24/status/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 24x24 -context = status - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-wireless-25.png \ - mate-netspeed-wireless-50.png \ - mate-netspeed-wireless-75.png \ - mate-netspeed-wireless-100.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/32x32/Makefile.am b/netspeed/icons/32x32/Makefile.am deleted file mode 100644 index eb00566d..00000000 --- a/netspeed/icons/32x32/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = apps devices - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/32x32/apps/Makefile.am b/netspeed/icons/32x32/apps/Makefile.am deleted file mode 100644 index cfa6294f..00000000 --- a/netspeed/icons/32x32/apps/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 32x32 -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-applet.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/32x32/devices/Makefile.am b/netspeed/icons/32x32/devices/Makefile.am deleted file mode 100644 index 553bf0d4..00000000 --- a/netspeed/icons/32x32/devices/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 32x32 -context = devices - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-plip.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/48x48/Makefile.am b/netspeed/icons/48x48/Makefile.am deleted file mode 100644 index eb00566d..00000000 --- a/netspeed/icons/48x48/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = apps devices - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/48x48/apps/Makefile.am b/netspeed/icons/48x48/apps/Makefile.am deleted file mode 100644 index 9e7b9d84..00000000 --- a/netspeed/icons/48x48/apps/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 48x48 -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-applet.png - -EXTRA_DIST = \ - $(icons_DATA) - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/48x48/devices/Makefile.am b/netspeed/icons/48x48/devices/Makefile.am deleted file mode 100644 index a81ac445..00000000 --- a/netspeed/icons/48x48/devices/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 48x48 -context = devices - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-plip.png - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/Makefile.am b/netspeed/icons/Makefile.am index 123b8e39..17fc4ef2 100644 --- a/netspeed/icons/Makefile.am +++ b/netspeed/icons/Makefile.am @@ -1,6 +1,30 @@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable +NULL = -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +iconsdir = $(datadir)/icons/hicolor + +png_icons = \ + 16x16/apps/mate-netspeed-applet.png \ + 16x16/devices/mate-netspeed-plip.png \ + 22x22/apps/mate-netspeed-applet.png \ + 22x22/devices/mate-netspeed-plip.png \ + 24x24/apps/mate-netspeed-applet.png \ + 24x24/devices/mate-netspeed-plip.png \ + 24x24/status/mate-netspeed-wireless-25.png \ + 24x24/status/mate-netspeed-wireless-50.png \ + 24x24/status/mate-netspeed-wireless-75.png \ + 24x24/status/mate-netspeed-wireless-100.png \ + 32x32/apps/mate-netspeed-applet.png \ + 32x32/devices/mate-netspeed-plip.png \ + 48x48/apps/mate-netspeed-applet.png \ + 48x48/devices/mate-netspeed-plip.png \ + $(NULL) + +nobase_dist_icons_DATA = \ + $(png_icons) \ + scalable/apps/mate-netspeed-applet.svg \ + $(NULL) + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir) install-data-hook: update-icon-cache uninstall-hook: update-icon-cache diff --git a/netspeed/icons/scalable/Makefile.am b/netspeed/icons/scalable/Makefile.am deleted file mode 100644 index 237e2099..00000000 --- a/netspeed/icons/scalable/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = apps - - --include $(top_srcdir)/git.mk diff --git a/netspeed/icons/scalable/apps/Makefile.am b/netspeed/icons/scalable/apps/Makefile.am deleted file mode 100644 index c869cfdf..00000000 --- a/netspeed/icons/scalable/apps/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = scalable -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - mate-netspeed-applet.svg - -noinst_DATA = - -EXTRA_DIST = \ - $(icons_DATA) \ - $(noinst_DATA) - - --include $(top_srcdir)/git.mk -- cgit v1.2.1