build: cleanup Makefile.am and icons/meson.build by sorting files

2 files changed, 38 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index 802149dd..d97d54cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,28 +55,29 @@ icon16dir = $(datadir)/icons/hicolor/16x16/apps
 icon16_DATA = \
 	icons/16/nm-device-wired.png \
 	icons/16/nm-no-connection.png \
-	icons/16/nm-vpn-standalone-lock.png
+	icons/16/nm-vpn-standalone-lock.png \
+	$(NULL)
 EXTRA_DIST += $(icon16_DATA)
 
 icon22dir = $(datadir)/icons/hicolor/22x22/apps
 icon22_DATA = \
 	icons/22/nm-adhoc.png \
-	icons/22/nm-device-wired.png \
 	icons/22/nm-device-wired-secure.png \
+	icons/22/nm-device-wired.png \
 	icons/22/nm-device-wwan.png \
 	icons/22/nm-mb-roam.png \
 	icons/22/nm-no-connection.png \
 	icons/22/nm-secure-lock.png \
-	icons/22/nm-signal-00.png \
 	icons/22/nm-signal-00-secure.png \
-	icons/22/nm-signal-100.png \
+	icons/22/nm-signal-00.png \
 	icons/22/nm-signal-100-secure.png \
-	icons/22/nm-signal-25.png \
+	icons/22/nm-signal-100.png \
 	icons/22/nm-signal-25-secure.png \
-	icons/22/nm-signal-50.png \
+	icons/22/nm-signal-25.png \
 	icons/22/nm-signal-50-secure.png \
-	icons/22/nm-signal-75.png \
+	icons/22/nm-signal-50.png \
 	icons/22/nm-signal-75-secure.png \
+	icons/22/nm-signal-75.png \
 	icons/22/nm-stage01-connecting01.png \
 	icons/22/nm-stage01-connecting02.png \
 	icons/22/nm-stage01-connecting03.png \
@@ -133,38 +134,41 @@ icon22_DATA = \
 	icons/22/nm-vpn-connecting12.png \
 	icons/22/nm-vpn-connecting13.png \
 	icons/22/nm-vpn-connecting14.png \
-	icons/22/nm-wwan-tower.png
+	icons/22/nm-wwan-tower.png \
+	$(NULL)
 EXTRA_DIST += $(icon22_DATA)
 
 icon32dir = $(datadir)/icons/hicolor/32x32/apps
 icon32_DATA = \
 	icons/32/nm-device-wired.png \
-	icons/32/nm-no-connection.png
+	icons/32/nm-no-connection.png \
+	$(NULL)
 EXTRA_DIST += $(icon32_DATA)
 
 icon48dir = $(datadir)/icons/hicolor/48x48/apps
 icon48_DATA = \
-	icons/48/nm-device-wireless.png
+	icons/48/nm-device-wireless.png \
+	$(NULL)
 EXTRA_DIST += $(icon48_DATA)
 
 iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
 iconscalable_DATA = \
-	icons/scalable/nm-device-wired.svg \
-	icons/scalable/nm-no-connection.svg \
 	icons/scalable/nm-device-wired-secure-symbolic.svg \
 	icons/scalable/nm-device-wired-symbolic.svg \
+	icons/scalable/nm-device-wired.svg \
 	icons/scalable/nm-device-wwan-symbolic.svg \
 	icons/scalable/nm-no-connection-symbolic.svg \
+	icons/scalable/nm-no-connection.svg \
 	icons/scalable/nm-signal-00-secure-symbolic.svg \
 	icons/scalable/nm-signal-00-symbolic.svg \
+	icons/scalable/nm-signal-100-secure-symbolic.svg \
+	icons/scalable/nm-signal-100-symbolic.svg \
 	icons/scalable/nm-signal-25-secure-symbolic.svg \
 	icons/scalable/nm-signal-25-symbolic.svg \
 	icons/scalable/nm-signal-50-secure-symbolic.svg \
 	icons/scalable/nm-signal-50-symbolic.svg \
 	icons/scalable/nm-signal-75-secure-symbolic.svg \
 	icons/scalable/nm-signal-75-symbolic.svg \
-	icons/scalable/nm-signal-100-secure-symbolic.svg \
-	icons/scalable/nm-signal-100-symbolic.svg \
 	icons/scalable/nm-vpn-active-lock-symbolic.svg \
 	icons/scalable/nm-vpn-connecting01-symbolic.svg \
 	icons/scalable/nm-vpn-connecting02-symbolic.svg \
@@ -180,7 +184,8 @@ iconscalable_DATA = \
 	icons/scalable/nm-vpn-connecting12-symbolic.svg \
 	icons/scalable/nm-vpn-connecting13-symbolic.svg \
 	icons/scalable/nm-vpn-connecting14-symbolic.svg \
-	icons/scalable/nm-vpn-standalone-lock-symbolic.svg
+	icons/scalable/nm-vpn-standalone-lock-symbolic.svg \
+	$(NULL)
 EXTRA_DIST += $(iconscalable_DATA)
 
 EXTRA_DIST += icons/meson.build
diff --git a/icons/meson.build b/icons/meson.build
index 18286a92..4341112b 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -1,27 +1,27 @@
 icons_16 = [
   'nm-device-wired.png',
   'nm-no-connection.png',
-  'nm-vpn-standalone-lock.png'
+  'nm-vpn-standalone-lock.png',
 ]
 
 icons_22 = [
   'nm-adhoc.png',
-  'nm-device-wired.png',
   'nm-device-wired-secure.png',
+  'nm-device-wired.png',
   'nm-device-wwan.png',
   'nm-mb-roam.png',
   'nm-no-connection.png',
   'nm-secure-lock.png',
-  'nm-signal-00.png',
   'nm-signal-00-secure.png',
-  'nm-signal-100.png',
+  'nm-signal-00.png',
   'nm-signal-100-secure.png',
-  'nm-signal-25.png',
+  'nm-signal-100.png',
   'nm-signal-25-secure.png',
-  'nm-signal-50.png',
+  'nm-signal-25.png',
   'nm-signal-50-secure.png',
-  'nm-signal-75.png',
+  'nm-signal-50.png',
   'nm-signal-75-secure.png',
+  'nm-signal-75.png',
   'nm-stage01-connecting01.png',
   'nm-stage01-connecting02.png',
   'nm-stage01-connecting03.png',
@@ -78,33 +78,35 @@ icons_22 = [
   'nm-vpn-connecting12.png',
   'nm-vpn-connecting13.png',
   'nm-vpn-connecting14.png',
-  'nm-wwan-tower.png'
+  'nm-wwan-tower.png',
 ]
 
 icons_32 = [
   'nm-device-wired.png',
-  'nm-no-connection.png'
+  'nm-no-connection.png',
 ]
 
-icons_48 = ['nm-device-wireless.png']
+icons_48 = [
+  'nm-device-wireless.png',
+]
 
 icons_scalable = [
-  'nm-device-wired.svg',
-  'nm-no-connection.svg',
   'nm-device-wired-secure-symbolic.svg',
   'nm-device-wired-symbolic.svg',
+  'nm-device-wired.svg',
   'nm-device-wwan-symbolic.svg',
   'nm-no-connection-symbolic.svg',
+  'nm-no-connection.svg',
   'nm-signal-00-secure-symbolic.svg',
   'nm-signal-00-symbolic.svg',
+  'nm-signal-100-secure-symbolic.svg',
+  'nm-signal-100-symbolic.svg',
   'nm-signal-25-secure-symbolic.svg',
   'nm-signal-25-symbolic.svg',
   'nm-signal-50-secure-symbolic.svg',
   'nm-signal-50-symbolic.svg',
   'nm-signal-75-secure-symbolic.svg',
   'nm-signal-75-symbolic.svg',
-  'nm-signal-100-secure-symbolic.svg',
-  'nm-signal-100-symbolic.svg',
   'nm-vpn-active-lock-symbolic.svg',
   'nm-vpn-connecting01-symbolic.svg',
   'nm-vpn-connecting02-symbolic.svg',
@@ -120,7 +122,7 @@ icons_scalable = [
   'nm-vpn-connecting12-symbolic.svg',
   'nm-vpn-connecting13-symbolic.svg',
   'nm-vpn-connecting14-symbolic.svg',
-  'nm-vpn-standalone-lock-symbolic.svg'
+  'nm-vpn-standalone-lock-symbolic.svg',
 ]
 
 icons = [
@@ -129,7 +131,7 @@ icons = [
   ['22', '22x22', icons_22],
   ['32', '32x32', icons_32],
   ['48', '48x48', icons_48],
-  ['scalable', 'scalable', icons_scalable]
+  ['scalable', 'scalable', icons_scalable],
 ]
 
 foreach icon: icons