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

3 files changed, 56 insertions, 20 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 008e318..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# doc/Makefile.am for Fluxbox 0.9  - an X11 Window manager
-# Makefile.am for fluxbox/doc
-
-CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-apps.5 \
-        fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5
-MAINTAINERCLEANFILES = Makefile.in
-man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox-apps.5 \
-        fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 \
-        startfluxbox.1
-EXTRA_DIST=startfluxbox.1.in CODESTYLE \
-        fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-apps.5.in \
-        fluxbox-keys.5.in fluxbox-menu.5.in fluxbox-remote.1.in fluxbox-style.5.in
-distclean-local:
-        rm -f *\~
-
-%: %.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@
diff --git a/doc/Makemodule.am b/doc/Makemodule.am
new file mode 100644
index 0000000..240f5c7
--- /dev/null
+++ b/doc/Makemodule.am
@@ -0,0 +1,39 @@
+CLEANFILES += \
+        doc/fbrun.1 \
+        doc/fbsetbg.1 \
+        doc/fbsetroot.1 \
+        doc/fluxbox-apps.5 \
+        doc/fluxbox-keys.5 \
+        doc/fluxbox-menu.5 \
+        doc/fluxbox-remote.1 \
+        doc/fluxbox-style.5 \
+        doc/fluxbox.1 \
+        doc/startfluxbox.1
+
+dist_man_MANS = \
+        doc/fbrun.1 \
+        doc/fbsetbg.1 \
+        doc/fbsetroot.1 \
+        doc/fluxbox-apps.5 \
+        doc/fluxbox-keys.5 \
+        doc/fluxbox-menu.5 \
+        doc/fluxbox-remote.1 \
+        doc/fluxbox-style.5 \
+        doc/fluxbox.1 \
+        doc/startfluxbox.1
+
+EXTRA_DIST += \
+        doc/CODESTYLE \
+        doc/fbrun.1.in \
+        doc/fbsetbg.1.in \
+        doc/fbsetroot.1.in \
+        doc/fluxbox-apps.5.in \
+        doc/fluxbox-keys.5.in \
+        doc/fluxbox-menu.5.in \
+        doc/fluxbox-remote.1.in \
+        doc/fluxbox-style.5.in \
+        doc/fluxbox.1.in \
+        doc/startfluxbox.1.in
+
+%: %.in
+        @regex_cmd@ -e "s,@pkgdatadir[@],$(pkgdatadir)," $^ > $@
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index 666d437..0e084e8 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -2,10 +2,24 @@
 # create manpages from the asciidoc files
 #
 
-SRC1 = fluxbox.txt fluxbox-remote.txt fbrun.txt fbsetbg.txt fbsetroot.txt startfluxbox.txt
-SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt fluxbox-menu.txt
+SRC1 = \
+        fbrun.txt \
+        fbsetbg.txt \
+        fbsetroot.txt \
+        fluxbox-remote.txt \
+        fluxbox.txt \
+        startfluxbox.txt
+
+SRC5 = \
+        fluxbox-apps.txt \
+        fluxbox-keys.txt \
+        fluxbox-menu.txt \
+        fluxbox-style.txt
+
+MAN = \
+        $(SRC1:.txt=.1) \
+        $(SRC5:.txt=.5)
 
-MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
 MANdotIN = $(addsuffix .in,$(MAN))
 DISTFILES = $(addprefix ../,$(MANdotIN))