summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-07-28 16:20:04 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-08-01 11:24:26 +0800
commitc43847fe14e6b32cc58b8e8168f78e72ef94316d (patch)
tree4593c0e9d6adc4af40450a92aa4414109f9d29a4 /utils
parent6c0dd46749cd791f3923e0d60f41d7a5e1033945 (diff)
downloadtalos-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 'utils')
-rw-r--r--utils/Makefile.am33
1 files changed, 11 insertions, 22 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index f0a6fc5..7c92f20 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -12,28 +12,17 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lib \
- $(DEFAULT_CPPFLAGS)
+dist_sbin_SCRIPTS += utils/pb-udhcpc
+dist_pkglibexec_SCRIPTS = utils/pb-console utils/pb-sysinfo
+sbin_PROGRAMS += utils/pb-event
-AM_CFLAGS = \
- $(DEFAULT_CFLAGS)
-
-dist_sbin_SCRIPTS = pb-udhcpc
-dist_pkglibexec_SCRIPTS = pb-console pb-sysinfo
-
-sbin_PROGRAMS = pb-event
-
-pb_event_SOURCES = pb-event.c
+utils_pb_event_SOURCES = utils/pb-event.c
dist_pkgdata_DATA = \
- kboot.conf.sample \
- bb-kexec-reboot \
- logrotate.conf \
- hooks/01-create-default-dtb \
- hooks/20-update-dtb-sample \
- hooks/20-set-stdout \
- hooks/90-sort-dtb
-
-MAINTAINERCLEANFILES = Makefile.in
+ utils/kboot.conf.sample \
+ utils/bb-kexec-reboot \
+ utils/logrotate.conf \
+ utils/hooks/01-create-default-dtb \
+ utils/hooks/20-update-dtb-sample \
+ utils/hooks/20-set-stdout \
+ utils/hooks/90-sort-dtb
OpenPOWER on IntegriCloud