19 files changed, 22 insertions, 24 deletions

diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index c2458c15..f20327cf 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+EXTRA_DIST =				\
+	$(Data_DATA)
 
+Datadir = $(datadir)/icons/hicolor/22x22/status
+
+Data_DATA =				\
+	xfpm-ac-adapter.png		\
+	xfpm-primary-000.png		\
+	xfpm-primary-020.png		\
+	xfpm-primary-040.png		\
+	xfpm-primary-060.png		\
+	xfpm-primary-080.png		\
+	xfpm-primary-100.png		\
+	xfpm-primary-000-charging.png	\
+	xfpm-primary-020-charging.png	\
+	xfpm-primary-040-charging.png	\
+	xfpm-primary-060-charging.png	\
+	xfpm-primary-080-charging.png	\
+	xfpm-primary-100-charging.png	\
+	xfpm-primary-charged.png		\
+	xfpm-primary-missing.png		\
+	xfpm-brightness-lcd-invalid.png	\
+	xfpm-brightness-lcd.png
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index f20327cf..00000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/22x22/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.png		\
-	xfpm-primary-000.png		\
-	xfpm-primary-020.png		\
-	xfpm-primary-040.png		\
-	xfpm-primary-060.png		\
-	xfpm-primary-080.png		\
-	xfpm-primary-100.png		\
-	xfpm-primary-000-charging.png	\
-	xfpm-primary-020-charging.png	\
-	xfpm-primary-040-charging.png	\
-	xfpm-primary-060-charging.png	\
-	xfpm-primary-080-charging.png	\
-	xfpm-primary-100-charging.png	\
-	xfpm-primary-charged.png		\
-	xfpm-primary-missing.png		\
-	xfpm-brightness-lcd-invalid.png	\
-	xfpm-brightness-lcd.png
diff --git a/data/icons/22x22/status/xfpm-ac-adapter.png b/data/icons/22x22/xfpm-ac-adapter.png
index 07e2cf42..07e2cf42 100644
--- a/data/icons/22x22/status/xfpm-ac-adapter.png
+++ b/data/icons/22x22/xfpm-ac-adapter.png
diff --git a/data/icons/22x22/status/xfpm-brightness-lcd-invalid.png b/data/icons/22x22/xfpm-brightness-lcd-invalid.png
index 5a13df2b..5a13df2b 100644
--- a/data/icons/22x22/status/xfpm-brightness-lcd-invalid.png
+++ b/data/icons/22x22/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/22x22/status/xfpm-brightness-lcd.png b/data/icons/22x22/xfpm-brightness-lcd.png
index a1ab0cec..a1ab0cec 100644
--- a/data/icons/22x22/status/xfpm-brightness-lcd.png
+++ b/data/icons/22x22/xfpm-brightness-lcd.png
diff --git a/data/icons/22x22/status/xfpm-primary-000-charging.png b/data/icons/22x22/xfpm-primary-000-charging.png
index 856c91ee..856c91ee 100644
--- a/data/icons/22x22/status/xfpm-primary-000-charging.png
+++ b/data/icons/22x22/xfpm-primary-000-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-000.png b/data/icons/22x22/xfpm-primary-000.png
index 798af3f5..798af3f5 100644
--- a/data/icons/22x22/status/xfpm-primary-000.png
+++ b/data/icons/22x22/xfpm-primary-000.png
diff --git a/data/icons/22x22/status/xfpm-primary-020-charging.png b/data/icons/22x22/xfpm-primary-020-charging.png
index 4c4810f8..4c4810f8 100644
--- a/data/icons/22x22/status/xfpm-primary-020-charging.png
+++ b/data/icons/22x22/xfpm-primary-020-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-020.png b/data/icons/22x22/xfpm-primary-020.png
index 93ff293c..93ff293c 100644
--- a/data/icons/22x22/status/xfpm-primary-020.png
+++ b/data/icons/22x22/xfpm-primary-020.png
diff --git a/data/icons/22x22/status/xfpm-primary-040-charging.png b/data/icons/22x22/xfpm-primary-040-charging.png
index 490afbe8..490afbe8 100644
--- a/data/icons/22x22/status/xfpm-primary-040-charging.png
+++ b/data/icons/22x22/xfpm-primary-040-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-040.png b/data/icons/22x22/xfpm-primary-040.png
index c6449a88..c6449a88 100644
--- a/data/icons/22x22/status/xfpm-primary-040.png
+++ b/data/icons/22x22/xfpm-primary-040.png
diff --git a/data/icons/22x22/status/xfpm-primary-060-charging.png b/data/icons/22x22/xfpm-primary-060-charging.png
index fadf904e..fadf904e 100644
--- a/data/icons/22x22/status/xfpm-primary-060-charging.png
+++ b/data/icons/22x22/xfpm-primary-060-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-060.png b/data/icons/22x22/xfpm-primary-060.png
index b333c07f..b333c07f 100644
--- a/data/icons/22x22/status/xfpm-primary-060.png
+++ b/data/icons/22x22/xfpm-primary-060.png
diff --git a/data/icons/22x22/status/xfpm-primary-080-charging.png b/data/icons/22x22/xfpm-primary-080-charging.png
index 3adb5937..3adb5937 100644
--- a/data/icons/22x22/status/xfpm-primary-080-charging.png
+++ b/data/icons/22x22/xfpm-primary-080-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-080.png b/data/icons/22x22/xfpm-primary-080.png
index 2ca7bd48..2ca7bd48 100644
--- a/data/icons/22x22/status/xfpm-primary-080.png
+++ b/data/icons/22x22/xfpm-primary-080.png
diff --git a/data/icons/22x22/status/xfpm-primary-100-charging.png b/data/icons/22x22/xfpm-primary-100-charging.png
index 22840dfe..22840dfe 100644
--- a/data/icons/22x22/status/xfpm-primary-100-charging.png
+++ b/data/icons/22x22/xfpm-primary-100-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-100.png b/data/icons/22x22/xfpm-primary-100.png
index 231e42d9..231e42d9 100644
--- a/data/icons/22x22/status/xfpm-primary-100.png
+++ b/data/icons/22x22/xfpm-primary-100.png
diff --git a/data/icons/22x22/status/xfpm-primary-charged.png b/data/icons/22x22/xfpm-primary-charged.png
index db67ec6e..db67ec6e 100644
--- a/data/icons/22x22/status/xfpm-primary-charged.png
+++ b/data/icons/22x22/xfpm-primary-charged.png
diff --git a/data/icons/22x22/status/xfpm-primary-missing.png b/data/icons/22x22/xfpm-primary-missing.png
index 887d0311..887d0311 100644
--- a/data/icons/22x22/status/xfpm-primary-missing.png
+++ b/data/icons/22x22/xfpm-primary-missing.png