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, 80 insertions, 86 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
deleted file mode 100644
index 63fe66a..0000000
--- a/util/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-# util/Makefile.am for Fluxbox
-SUBDIRS=                fbrun
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
-bin_SCRIPTS=            fbsetbg fluxbox-generate_menu startfluxbox
-bin_PROGRAMS=           fbsetroot fluxbox-update_configs fluxbox-remote
-fbsetroot_SOURCES=      fbsetroot.cc fbsetroot.hh
-fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
-                        ../src/FbTk/libFbTk.a
-fbsetroot_LDFLAGS = \
-        $(FONTCONFIG_LIBS) \
-        $(FRIBIDI_LIBS) \
-        $(X11_LIBS) \
-        $(XFT_LIBS) \
-        $(XRENDER_LIBS)
-
-fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc
-fluxbox_update_configs_LDADD=   ../src/defaults.o ../src/Resources.o \
-                        ../src/FbTk/libFbTk.a
-fluxbox_update_configs_LDFLAGS = \
-        $(FRIBIDI_LIBS) \
-        $(X11_LIBS)
-fluxbox_remote_SOURCES= fluxbox-remote.cc
-fluxbox_remote_LDFLAGS = $(X11_LIBS)
-
-MAINTAINERCLEANFILES=   Makefile.in
-EXTRA_DIST=             fbsetbg fluxbox-generate_menu.in \
-                                startfluxbox.in
-
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-all-local:      startfluxbox
-
-clean-local:
-                rm -f startfluxbox fluxbox-generate_menu
-
-fbsetroot.o:    fbsetroot.cc $(srcdir)/fbsetroot.hh \
-                        $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
-
-fluxbox-update_configs.o:       fluxbox-update_configs.cc \
-                        $(top_builddir)/src/defaults.hh
-
-fluxbox-remote.o:       fluxbox-remote.cc
-
-startfluxbox:   startfluxbox.in
-                @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-                            -e "s,@pkgbindir@,$(bindir),g" \
-                            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-                            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-                            -e "s,@EXEEXT@,$(EXEEXT),g" \
-                                $(srcdir)/startfluxbox.in > startfluxbox
-                -chmod 755 startfluxbox
-
-fluxbox-generate_menu: fluxbox-generate_menu.in
-                @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
-                            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-                            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-                            -e "s,@EXEEXT@,$(EXEEXT),g" \
-                                $(srcdir)/fluxbox-generate_menu.in \
-                                > fluxbox-generate_menu
-                -chmod 755 fluxbox-generate_menu
-
-../src/FbRootWindow.o:
-        cd ../src && ${MAKE} FbRootWindow.o
-../src/FbAtoms.o:
-        cd ../src && ${MAKE} FbAtoms.o
-../src/defaults.o:
-        cd ../src && ${MAKE} defaults.o
-../src/Resources.o:
-        cd ../src && ${MAKE} Resources.o
diff --git a/util/Makemodule.am b/util/Makemodule.am
new file mode 100644
index 0000000..44f3002
--- /dev/null
+++ b/util/Makemodule.am
@@ -0,0 +1,58 @@
+# util/Makefile.am for Fluxbox
+
+bin_SCRIPTS = \
+        util/fbsetbg \
+        util/fluxbox-generate_menu \
+        util/startfluxbox
+EXTRA_DIST += \
+        util/fbsetbg
+PATHFILES += \
+        util/startfluxbox \
+        util/fluxbox-generate_menu
+
+bin_PROGRAMS += \
+        fbsetroot \
+        fluxbox-remote \
+        fluxbox-update_configs
+
+fbsetroot_SOURCES = \
+        src/FbAtoms.cc \
+        src/FbRootWindow.cc \
+        util/fbsetroot.cc \
+        util/fbsetroot.hh
+fbsetroot_LDADD = \
+        libFbTk.a
+fbsetroot_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir) \
+        -I$(src_incdir) \
+        -I$(nls_incdir)
+fbsetroot_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XRENDER_LIBS)
+
+fluxbox_update_configs_SOURCES = \
+        src/defaults.cc \
+        src/Resources.cc \
+        util/fluxbox-update_configs.cc
+fluxbox_update_configs_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir) \
+        -I$(src_incdir) \
+        -I$(nls_incdir)
+fluxbox_update_configs_LDADD = \
+        libFbTk.a
+fluxbox_update_configs_LDFLAGS = \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS)
+
+fluxbox_remote_SOURCES = \
+        util/fluxbox-remote.cc
+fluxbox_remote_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+fluxbox_remote_LDFLAGS = \
+        $(X11_LIBS)
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
deleted file mode 100644
index 92f7c47..0000000
--- a/util/fbrun/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-FLUXBOX_SRC_DIR=        ../../src/
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
-bin_PROGRAMS=           fbrun
-fbrun_SOURCES=          FbRun.hh FbRun.cc main.cc fbrun.xpm
-fbrun_LDADD=            ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
-fbrun_LDFLAGS = \
-        $(FONTCONFIG_LIBS) \
-        $(FRIBIDI_LIBS) \
-        $(X11_LIBS) \
-        $(XINERAMA_LIBS) \
-        $(XFT_LIBS) \
-        $(XPM_LIBS) \
-        $(XRENDER_LIBS)
-
-${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
-        cd ${FLUXBOX_SRC_DIR}FbTk && make
diff --git a/util/fbrun/Makemodule.am b/util/fbrun/Makemodule.am
new file mode 100644
index 0000000..cb98e92
--- /dev/null
+++ b/util/fbrun/Makemodule.am
@@ -0,0 +1,22 @@
+bin_PROGRAMS += fbrun
+
+fbrun_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+
+fbrun_SOURCES = \
+        util/fbrun/FbRun.hh \
+        util/fbrun/FbRun.cc \
+        util/fbrun/main.cc \
+        util/fbrun/fbrun.xpm
+
+fbrun_LDADD = libFbTk.a
+
+fbrun_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XINERAMA_LIBS) \
+        $(XPM_LIBS) \
+        $(XRENDER_LIBS)