diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2014-07-28 16:20:04 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-08-01 11:24:26 +0800 |
| commit | c43847fe14e6b32cc58b8e8168f78e72ef94316d (patch) | |
| tree | 4593c0e9d6adc4af40450a92aa4414109f9d29a4 /ui/twin | |
| parent | 6c0dd46749cd791f3923e0d60f41d7a5e1033945 (diff) | |
| download | talos-petitboot-c43847fe14e6b32cc58b8e8168f78e72ef94316d.tar.gz talos-petitboot-c43847fe14e6b32cc58b8e8168f78e72ef94316d.zip | |
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>
Diffstat (limited to 'ui/twin')
| -rw-r--r-- | ui/twin/Makefile.am | 62 |
1 files changed, 27 insertions, 35 deletions
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 |
