diff options
| author | Gabe Black <gabeblack@google.com> | 2013-03-12 15:50:08 -0700 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-03-18 20:46:09 +0100 |
| commit | f06111aaf4fdb9974e79e130b7ac95cdffcaaa7c (patch) | |
| tree | a6c7f45bfbfc78d387a7d3eadd83638e3ab60a45 /payloads | |
| parent | a2d786f0e6a0db1c88d955ea80b040bebdea4396 (diff) | |
| download | coreboot-f06111aaf4fdb9974e79e130b7ac95cdffcaaa7c.tar.xz | |
libpayload: Fix the config file dependency in the Makefile template
The template had a dependency on config.h which was correct for coreboot,
where this build system originally came from, but not for libpayload which
uses the differently named libpayload-config.h, presumably to avoid colliding
with a config.h used by the actual payload. Because libpayload-config.h is now
effectively a dependency of everything, it doesn't have to be added piecemeal
in Makefile.inc.
Change-Id: I01f20d363cb1393fa1cdcf0dc916670db90294e9
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://review.coreboot.org/2763
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/libpayload/Makefile | 2 | ||||
| -rw-r--r-- | payloads/libpayload/Makefile.inc | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index c4a77bfd42..bfa1abf481 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -246,7 +246,7 @@ define create_cc_template # $4 additional dependencies ifn$(EMPTY)def $(1)-objs_$(2)_template de$(EMPTY)fine $(1)-objs_$(2)_template -$(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/config.h $(4) +$(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/libpayload-config.h $(4) @printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index b06288be51..9e6dc75d1e 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -47,11 +47,6 @@ classes-$(CONFIG_LZMA) += liblzma libraries := $(classes-y) classes-y += head.o -libpci-c-deps = $(obj)/libpayload-config.h -libc-c-deps = $(obj)/libpayload-config.h -libcurses-c-deps = $(obj)/libpayload-config.h -head.o-S-deps = $(obj)/libpayload-config.h - subdirs-y := arch/$(ARCHDIR-y) subdirs-y += crypto libc drivers libpci subdirs-$(CONFIG_CURSES) += curses |