Simplify icons directory structure

19 files changed, 22 insertions, 24 deletions

diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index c2458c15..9467c2cb 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+EXTRA_DIST =				\
+	$(Data_DATA)
 
+Datadir = $(datadir)/icons/hicolor/scalable/status
+
+Data_DATA =				\
+	xfpm-ac-adapter.svg		\
+	xfpm-primary-000.svg		\
+	xfpm-primary-020.svg		\
+	xfpm-primary-040.svg		\
+	xfpm-primary-060.svg		\
+	xfpm-primary-080.svg		\
+	xfpm-primary-100.svg		\
+	xfpm-primary-000-charging.svg	\
+	xfpm-primary-020-charging.svg	\
+	xfpm-primary-040-charging.svg	\
+	xfpm-primary-060-charging.svg	\
+	xfpm-primary-080-charging.svg	\
+	xfpm-primary-100-charging.svg	\
+	xfpm-primary-charged.svg		\
+	xfpm-primary-missing.svg		\
+	xfpm-brightness-lcd-invalid.svg	\
+	xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index 9467c2cb..00000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/scalable/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.svg		\
-	xfpm-primary-000.svg		\
-	xfpm-primary-020.svg		\
-	xfpm-primary-040.svg		\
-	xfpm-primary-060.svg		\
-	xfpm-primary-080.svg		\
-	xfpm-primary-100.svg		\
-	xfpm-primary-000-charging.svg	\
-	xfpm-primary-020-charging.svg	\
-	xfpm-primary-040-charging.svg	\
-	xfpm-primary-060-charging.svg	\
-	xfpm-primary-080-charging.svg	\
-	xfpm-primary-100-charging.svg	\
-	xfpm-primary-charged.svg		\
-	xfpm-primary-missing.svg		\
-	xfpm-brightness-lcd-invalid.svg	\
-	xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/status/xfpm-ac-adapter.svg b/data/icons/scalable/xfpm-ac-adapter.svg
index f40ab722..f40ab722 100644
--- a/data/icons/scalable/status/xfpm-ac-adapter.svg
+++ b/data/icons/scalable/xfpm-ac-adapter.svg
diff --git a/data/icons/scalable/status/xfpm-brightness-lcd-invalid.svg b/data/icons/scalable/xfpm-brightness-lcd-invalid.svg
index 6b92a7fb..6b92a7fb 100644
--- a/data/icons/scalable/status/xfpm-brightness-lcd-invalid.svg
+++ b/data/icons/scalable/xfpm-brightness-lcd-invalid.svg
diff --git a/data/icons/scalable/status/xfpm-brightness-lcd.svg b/data/icons/scalable/xfpm-brightness-lcd.svg
index 5c94c70c..5c94c70c 100644
--- a/data/icons/scalable/status/xfpm-brightness-lcd.svg
+++ b/data/icons/scalable/xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/status/xfpm-primary-000-charging.svg b/data/icons/scalable/xfpm-primary-000-charging.svg
index f9d3529a..f9d3529a 100644
--- a/data/icons/scalable/status/xfpm-primary-000-charging.svg
+++ b/data/icons/scalable/xfpm-primary-000-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-000.svg b/data/icons/scalable/xfpm-primary-000.svg
index 7e67f647..7e67f647 100644
--- a/data/icons/scalable/status/xfpm-primary-000.svg
+++ b/data/icons/scalable/xfpm-primary-000.svg
diff --git a/data/icons/scalable/status/xfpm-primary-020-charging.svg b/data/icons/scalable/xfpm-primary-020-charging.svg
index 3bcf151e..3bcf151e 100644
--- a/data/icons/scalable/status/xfpm-primary-020-charging.svg
+++ b/data/icons/scalable/xfpm-primary-020-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-020.svg b/data/icons/scalable/xfpm-primary-020.svg
index 54eca18c..54eca18c 100644
--- a/data/icons/scalable/status/xfpm-primary-020.svg
+++ b/data/icons/scalable/xfpm-primary-020.svg
diff --git a/data/icons/scalable/status/xfpm-primary-040-charging.svg b/data/icons/scalable/xfpm-primary-040-charging.svg
index 9f746b04..9f746b04 100644
--- a/data/icons/scalable/status/xfpm-primary-040-charging.svg
+++ b/data/icons/scalable/xfpm-primary-040-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-040.svg b/data/icons/scalable/xfpm-primary-040.svg
index 04f0f89e..04f0f89e 100644
--- a/data/icons/scalable/status/xfpm-primary-040.svg
+++ b/data/icons/scalable/xfpm-primary-040.svg
diff --git a/data/icons/scalable/status/xfpm-primary-060-charging.svg b/data/icons/scalable/xfpm-primary-060-charging.svg
index 78802ca3..78802ca3 100644
--- a/data/icons/scalable/status/xfpm-primary-060-charging.svg
+++ b/data/icons/scalable/xfpm-primary-060-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-060.svg b/data/icons/scalable/xfpm-primary-060.svg
index 4ce9f7b7..4ce9f7b7 100644
--- a/data/icons/scalable/status/xfpm-primary-060.svg
+++ b/data/icons/scalable/xfpm-primary-060.svg
diff --git a/data/icons/scalable/status/xfpm-primary-080-charging.svg b/data/icons/scalable/xfpm-primary-080-charging.svg
index 6dfa4049..6dfa4049 100644
--- a/data/icons/scalable/status/xfpm-primary-080-charging.svg
+++ b/data/icons/scalable/xfpm-primary-080-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-080.svg b/data/icons/scalable/xfpm-primary-080.svg
index ffae4a5b..ffae4a5b 100644
--- a/data/icons/scalable/status/xfpm-primary-080.svg
+++ b/data/icons/scalable/xfpm-primary-080.svg
diff --git a/data/icons/scalable/status/xfpm-primary-100-charging.svg b/data/icons/scalable/xfpm-primary-100-charging.svg
index 9a97fd7c..9a97fd7c 100644
--- a/data/icons/scalable/status/xfpm-primary-100-charging.svg
+++ b/data/icons/scalable/xfpm-primary-100-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-100.svg b/data/icons/scalable/xfpm-primary-100.svg
index 039a6386..039a6386 100644
--- a/data/icons/scalable/status/xfpm-primary-100.svg
+++ b/data/icons/scalable/xfpm-primary-100.svg
diff --git a/data/icons/scalable/status/xfpm-primary-charged.svg b/data/icons/scalable/xfpm-primary-charged.svg
index 6054af22..6054af22 100644
--- a/data/icons/scalable/status/xfpm-primary-charged.svg
+++ b/data/icons/scalable/xfpm-primary-charged.svg
diff --git a/data/icons/scalable/status/xfpm-primary-missing.svg b/data/icons/scalable/xfpm-primary-missing.svg
index f1128516..f1128516 100644
--- a/data/icons/scalable/status/xfpm-primary-missing.svg
+++ b/data/icons/scalable/xfpm-primary-missing.svg