build-sys: move to non-recursive build

This rather large change will attempts to make 'make' to work better.
See excellent paper 'Recursive Make Considered Harmful' by Peter Miller
for further explanation why several make files is worse than one for
whole project.

Note.  The tests are build with 'make check' rather than defining TEST.

Reference: http://miller.emu.id.au/pmiller/books/rmch/
Reference: http://karelzak.blogspot.co.uk/2013/02/non-recursive-automake.html

4 files changed, 36 insertions, 18 deletions

diff --git a/data/styles/arch/Makefile.am b/data/styles/arch/Makefile.am
deleted file mode 100644
index bc1aafa..0000000
--- a/data/styles/arch/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/arch
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/arch/Makemodule.am b/data/styles/arch/Makemodule.am
new file mode 100644
index 0000000..4ad28b9
--- /dev/null
+++ b/data/styles/arch/Makemodule.am
@@ -0,0 +1,3 @@
+arch_styledir = $(pkgdatadir)/styles/arch
+
+dist_arch_style_DATA = data/styles/arch/theme.cfg
diff --git a/data/styles/arch/pixmaps/Makefile.am b/data/styles/arch/pixmaps/Makefile.am
deleted file mode 100644
index fb94c36..0000000
--- a/data/styles/arch/pixmaps/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-styledir = $(pkgdatadir)/styles/arch/pixmaps
-
-style_DATA = closepr.xpm gripfcs.xpm maxufcs.xpm menuiconufcs.xpm \
-         minufcs.xpm shadepr.xpm stickpr.xpm stuckufcs.xpm unselected.xpm \
-         unshadeufcs.xpm bullet.xpm closeufcs.xpm maxfcs.xpm \
-         menuiconfcs.xpm minfcs.xpm selected.xpm shadeufcs.xpm \
-         stickufcs.xpm tbarfcs.xpm unshadefcs.xpm closefcs.xpm \
-        frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \
-         stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm
-
-
-include ../../Makefile.include
diff --git a/data/styles/arch/pixmaps/Makemodule.am b/data/styles/arch/pixmaps/Makemodule.am
new file mode 100644
index 0000000..fa47014
--- /dev/null
+++ b/data/styles/arch/pixmaps/Makemodule.am
@@ -0,0 +1,33 @@
+arch_pixmaps_styledir = $(pkgdatadir)/styles/arch/pixmaps
+
+dist_arch_pixmaps_style_DATA = \
+        data/styles/arch/pixmaps/bullet.xpm \
+        data/styles/arch/pixmaps/closefcs.xpm \
+        data/styles/arch/pixmaps/closepr.xpm \
+        data/styles/arch/pixmaps/closeufcs.xpm \
+        data/styles/arch/pixmaps/frame.xpm \
+        data/styles/arch/pixmaps/gripfcs.xpm \
+        data/styles/arch/pixmaps/maxfcs.xpm \
+        data/styles/arch/pixmaps/maxpr.xpm \
+        data/styles/arch/pixmaps/maxufcs.xpm \
+        data/styles/arch/pixmaps/menuiconfcs.xpm \
+        data/styles/arch/pixmaps/menuiconpr.xpm \
+        data/styles/arch/pixmaps/menuiconufcs.xpm \
+        data/styles/arch/pixmaps/minfcs.xpm \
+        data/styles/arch/pixmaps/minpr.xpm \
+        data/styles/arch/pixmaps/minufcs.xpm \
+        data/styles/arch/pixmaps/selected.xpm \
+        data/styles/arch/pixmaps/shadefcs.xpm \
+        data/styles/arch/pixmaps/shadepr.xpm \
+        data/styles/arch/pixmaps/shadeufcs.xpm \
+        data/styles/arch/pixmaps/stickfcs.xpm \
+        data/styles/arch/pixmaps/stickpr.xpm \
+        data/styles/arch/pixmaps/stickufcs.xpm \
+        data/styles/arch/pixmaps/stuckfcs.xpm \
+        data/styles/arch/pixmaps/stuckufcs.xpm \
+        data/styles/arch/pixmaps/tbarfcs.xpm \
+        data/styles/arch/pixmaps/tbarufcs.xpm \
+        data/styles/arch/pixmaps/unselected.xpm \
+        data/styles/arch/pixmaps/unshadefcs.xpm \
+        data/styles/arch/pixmaps/unshadepr.xpm \
+        data/styles/arch/pixmaps/unshadeufcs.xpm