autotools: Use non-recursive make

With the current testing infrastructure, we don't have a strictly
hierarchical set of dependencies. This causes problems with a recursive
make, and means we have to hack around some of the dependencies.

This change generates a single, top-level makefile from all of the
Makefile.am fragments. We still need the po/ directory as a separate
SUBDIR, but all others can be converted to non-recursive.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

4 files changed, 101 insertions, 137 deletions

diff --git a/ui/common/Makefile.am b/ui/common/Makefile.am
index a7b2f0f..df6ea02 100644
--- a/ui/common/Makefile.am
+++ b/ui/common/Makefile.am
@@ -12,48 +12,39 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	$(DEFAULT_CPPFLAGS)
-
-AM_CFLAGS = \
-	$(DEFAULT_CFLAGS)
-
-noinst_LTLIBRARIES = libpbui.la
-
-libpbui_la_SOURCES = \
-	discover-client.c \
-	discover-client.h \
-	joystick.c \
-	joystick.h \
-	timer.c \
-	timer.h \
-	ui-system.c \
-	ui-system.h
+noinst_LTLIBRARIES += ui/common/libpbui.la
+
+ui_common_libpbui_la_SOURCES = \
+	ui/common/discover-client.c \
+	ui/common/discover-client.h \
+	ui/common/joystick.c \
+	ui/common/joystick.h \
+	ui/common/timer.c \
+	ui/common/timer.h \
+	ui/common/ui-system.c \
+	ui/common/ui-system.h
 
 if ENABLE_PS3
-libpbui_la_SOURCES += \
-	ps3.c \
-	ps3.h
+ui_common_libpbui_la_SOURCES += \
+	ui/common/ps3.c \
+	ui/common/ps3.h
 endif
 
 artwork =
 
 if WITH_TWIN
 artwork += \
-	$(srcdir)/artwork/background.jpg \
-	$(srcdir)/artwork/COPYING-tux \
-	$(srcdir)/artwork/tux.png \
-	$(srcdir)/artwork/oxygen/applications-system.png \
-	$(srcdir)/artwork/oxygen/configure.png \
-	$(srcdir)/artwork/oxygen/COPYING-oxygen \
-	$(srcdir)/artwork/oxygen/drive-harddisk.png \
-	$(srcdir)/artwork/oxygen/network-wired.png \
-	$(srcdir)/artwork/oxygen/utilities-terminal.png
+	$(srcdir)/ui/common/artwork/background.jpg \
+	$(srcdir)/ui/common/artwork/COPYING-tux \
+	$(srcdir)/ui/common/artwork/tux.png \
+	$(srcdir)/ui/common/artwork/oxygen/applications-system.png \
+	$(srcdir)/ui/common/artwork/oxygen/configure.png \
+	$(srcdir)/ui/common/artwork/oxygen/COPYING-oxygen \
+	$(srcdir)/ui/common/artwork/oxygen/drive-harddisk.png \
+	$(srcdir)/ui/common/artwork/oxygen/network-wired.png \
+	$(srcdir)/ui/common/artwork/oxygen/utilities-terminal.png
 endif
 
 artworkdir = $(pkgdatadir)/artwork/
 dist_artwork_DATA = $(artwork)
 
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am
index 6112b65..9a4e1e4 100644
--- a/ui/ncurses/Makefile.am
+++ b/ui/ncurses/Makefile.am
@@ -12,66 +12,59 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	-DLOCALEDIR='"$(localedir)"' \
-	$(DEFAULT_CPPFLAGS)
-
-AM_CFLAGS = \
-	$(DEFAULT_CFLAGS)
-
-common_libs = \
-	libpbnc.la \
-	$(top_builddir)/ui/common/libpbui.la \
-	$(top_builddir)/lib/libpbcore.la \
+ui_ncurses_common_libs = \
+	ui/ncurses/libpbnc.la \
+	ui/common/libpbui.la \
+	$(core_lib) \
 	@MENU_LIB@ @FORM_LIB@ @CURSES_LIB@
 
-noinst_LTLIBRARIES = libpbnc.la
+noinst_LTLIBRARIES += ui/ncurses/libpbnc.la
 
-libpbnc_la_SOURCES = \
-	nc-config.c \
-	nc-config.h \
-	nc-config-help.c \
-	nc-cui.c \
-	nc-cui.h \
-	nc-cui-help.c \
-	nc-boot-editor.c \
-	nc-boot-editor.h \
-	nc-boot-editor-help.c \
-	nc-helpscreen.c \
-	nc-helpscreen.h \
-	nc-lang.c \
-	nc-lang.h \
-	nc-menu.c \
-	nc-menu.h \
-	nc-scr.c \
-	nc-scr.h \
-	nc-sysinfo.c \
-	nc-sysinfo.h \
-	nc-sysinfo-help.c \
-	nc-textscreen.c \
-	nc-textscreen.h \
-	nc-widgets.c \
-	nc-widgets.h \
-	nc-add-url.c \
-	nc-add-url.h \
-	nc-add-url-help.c
+ui_ncurses_libpbnc_la_SOURCES = \
+	ui/ncurses/nc-config.c \
+	ui/ncurses/nc-config.h \
+	ui/ncurses/nc-config-help.c \
+	ui/ncurses/nc-cui.c \
+	ui/ncurses/nc-cui.h \
+	ui/ncurses/nc-cui-help.c \
+	ui/ncurses/nc-boot-editor.c \
+	ui/ncurses/nc-boot-editor.h \
+	ui/ncurses/nc-boot-editor-help.c \
+	ui/ncurses/nc-helpscreen.c \
+	ui/ncurses/nc-helpscreen.h \
+	ui/ncurses/nc-lang.c \
+	ui/ncurses/nc-lang.h \
+	ui/ncurses/nc-menu.c \
+	ui/ncurses/nc-menu.h \
+	ui/ncurses/nc-scr.c \
+	ui/ncurses/nc-scr.h \
+	ui/ncurses/nc-sysinfo.c \
+	ui/ncurses/nc-sysinfo.h \
+	ui/ncurses/nc-sysinfo-help.c \
+	ui/ncurses/nc-textscreen.c \
+	ui/ncurses/nc-textscreen.h \
+	ui/ncurses/nc-widgets.c \
+	ui/ncurses/nc-widgets.h \
+	ui/ncurses/nc-add-url.c \
+	ui/ncurses/nc-add-url.h \
+	ui/ncurses/nc-add-url-help.c
 
-sbin_PROGRAMS = petitboot-nc
+sbin_PROGRAMS += ui/ncurses/petitboot-nc
 
 if ENABLE_PS3
-sbin_PROGRAMS += petitboot-ps3-nc
+sbin_PROGRAMS += ui/ncurses/petitboot-ps3-nc
 endif
 
+ui_ncurses_petitboot_nc_CPPFLAGS = \
+	$(DEFAULT_CPPFLAGS) \
+	-DLOCALEDIR='"$(localedir)"' \
+	-I$(top_srcdir)/lib
 
-petitboot_nc_SOURCES = generic-main.c
-petitboot_nc_LDADD = $(common_libs)
-
-petitboot_ps3_nc_SOURCES = ps3-main.c
-petitboot_ps3_nc_LDADD = $(common_libs) $(libdir)/libps3-utils.so
-#petitboot_ps3_nc_LDFLAGS = -L$(libdir) -lps3-utils
+ui_ncurses_petitboot_nc_SOURCES = ui/ncurses/generic-main.c
+ui_ncurses_petitboot_nc_LDADD = $(ui_ncurses_common_libs)
 
-EXTRA_DIST = ui-guidelines.text
+ui_ncurses_petitboot_ps3_nc_SOURCES = ui/ncurses/ps3-main.c
+ui_ncurses_petitboot_ps3_nc_LDADD = $(ui_ncurses_common_libs) \
+				    $(libdir)/libps3-utils.so
 
-MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST += ui/ncurses/ui-guidelines.text
diff --git a/ui/test/Makefile.am b/ui/test/Makefile.am
index 63b7d8c..afdf301 100644
--- a/ui/test/Makefile.am
+++ b/ui/test/Makefile.am
@@ -11,22 +11,10 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
+#
+noinst_PROGRAMS += ui/test/discover-test
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	$(DEFAULT_CPPFLAGS)
-
-AM_CFLAGS = \
-	$(DEFAULT_CFLAGS)
-
-common_libs = \
-	$(top_builddir)/ui/common/libpbui.la \
-	$(top_builddir)/lib/libpbcore.la
-
-noinst_PROGRAMS = discover-test
-
-discover_test_SOURCES = discover-test.c
-discover_test_LDADD = $(common_libs)
-
-MAINTAINERCLEANFILES = Makefile.in
+ui_test_discover_test_SOURCES = ui/test/discover-test.c
+ui_test_discover_test_LDADD = \
+	ui/common/libpbui.la \
+	$(core_lib)
diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am
index 053e73c..2c5032a 100644
--- a/ui/twin/Makefile.am
+++ b/ui/twin/Makefile.am
@@ -12,50 +12,42 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	$(DEFAULT_CPPFLAGS) \
-	$(twin_CFLAGS)
-
-AM_CFLAGS = \
-	-DPB_ARTWORK_PATH='"$(pkgdatadir)/artwork/"' \
-	$(DEFAULT_CFLAGS)  \
-	 $(twin_CFLAGS)
+ui_twin_common_libs = \
+	ui/twin/libpbt.la \
+	ui/common/libpbui.la \
+	$(core_lib)
 
-AM_LDFLAGS = \
-	$(twin_LIBS)
+ui_twin_common_cppflags = \
+	$(DEFAULT_CPPFLAGS) \
+	-I$(top_srcdir)/lib \
+	-DPB_ARTWORK_PATH='"$(pkgdatadir)/artwork/"'
 
-common_libs = \
-	libpbt.la \
-	$(top_builddir)/ui/common/libpbui.la \
-	$(top_builddir)/lib/libpbcore.la
+noinst_LTLIBRARIES += ui/twin/libpbt.la
 
-noinst_LTLIBRARIES = libpbt.la
+ui_twin_libpbt_la_SOURCES = \
+	ui/twin/pbt-client.c \
+	ui/twin/pbt-client.h \
+	ui/twin/pbt-main.c \
+	ui/twin/pbt-main.h \
+	ui/twin/pbt-menu.c \
+	ui/twin/pbt-menu.h \
+	ui/twin/pbt-scr.c \
+	ui/twin/pbt-scr.h
 
-libpbt_la_SOURCES = \
-	pbt-client.c \
-	pbt-client.h \
-	pbt-main.c \
-	pbt-main.h \
-	pbt-menu.c \
-	pbt-menu.h \
-	pbt-scr.c \
-	pbt-scr.h
+ui_twin_libpbt_la_CPPFLAGS = $(ui_twin_common_cppflags)
 
-sbin_PROGRAMS = petitboot-twin
+sbin_PROGRAMS += ui/twin/petitboot-twin
 
 if ENABLE_PS3
-sbin_PROGRAMS += petitboot-ps3-twin
+sbin_PROGRAMS += ui/twin/petitboot-ps3-twin
 endif
 
 
-petitboot_twin_SOURCES = main-generic.c
-petitboot_twin_LDADD = $(common_libs)
-
-petitboot_ps3_twin_SOURCES = main-ps3.c
-petitboot_ps3_twin_LDADD = $(common_libs)
-petitboot_ps3_twin_LDFLAGS = -lps3-utils
+ui_twin_petitboot_twin_SOURCES = ui/twin/main-generic.c
+ui_twin_petitboot_twin_CPPFLAGS = $(ui_twin_common_cppflags)
+ui_twin_petitboot_twin_LDADD = $(ui_twin_common_libs) $(twin_LIBS)
 
+ui_twin_petitboot_ps3_twin_SOURCES = ui/twin/main-ps3.c
+ui_twin_petitboot_ps3_twin_CPPFLAGS = $(ui_twin_common_cppflags)
+ui_twin_petitboot_ps3_twin_LDADD = $(ui_twin_common_libs) $(twin_LIBS) -lps3-utils
 
-MAINTAINERCLEANFILES = Makefile.in