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, 27 insertions, 17 deletions

diff --git a/data/styles/BlueFlux/Makefile.am b/data/styles/BlueFlux/Makefile.am
deleted file mode 100644
index 86965dc..0000000
--- a/data/styles/BlueFlux/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/BlueFlux
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/BlueFlux/Makemodule.am b/data/styles/BlueFlux/Makemodule.am
new file mode 100644
index 0000000..0357a9d
--- /dev/null
+++ b/data/styles/BlueFlux/Makemodule.am
@@ -0,0 +1,3 @@
+blueflux_styledir = $(pkgdatadir)/styles/BlueFlux
+
+dist_blueflux_style_DATA = data/styles/BlueFlux/theme.cfg
diff --git a/data/styles/BlueFlux/pixmaps/Makefile.am b/data/styles/BlueFlux/pixmaps/Makefile.am
deleted file mode 100644
index a247c5a..0000000
--- a/data/styles/BlueFlux/pixmaps/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
-
-style_DATA = button_close_active.xpm button_close_pressed.xpm \
-        button_close_unfocus.xpm button_max_active.xpm button_max_pressed.xpm \
-        button_max_unfocus.xpm button_min_active.xpm button_min_pressed.xpm \
-        button_min_unfocus.xpm button_stick_active.xpm button_stick_pressed.xpm \
-        button_stick_unfocus.xpm button_stuck.xpm button_stuck_unfocus.xpm \
-        button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \
-        title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/BlueFlux/pixmaps/Makemodule.am b/data/styles/BlueFlux/pixmaps/Makemodule.am
new file mode 100644
index 0000000..9cfe8c4
--- /dev/null
+++ b/data/styles/BlueFlux/pixmaps/Makemodule.am
@@ -0,0 +1,24 @@
+blueflux_pixmaps_styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
+
+dist_blueflux_pixmaps_style_DATA = \
+        data/styles/BlueFlux/pixmaps/button_close_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_close_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_close_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_max_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_max_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_max_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_min_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_min_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_min_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_stick_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_stick_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_stuck.xpm \
+        data/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_toolbar.xpm \
+        data/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/menu_frame.xpm \
+        data/styles/BlueFlux/pixmaps/title_bar.xpm \
+        data/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/toolbar.xpm \
+        data/styles/BlueFlux/pixmaps/toolbar_label.xpm