From eaeecde7bc67b473786d4adc4d923a4798f50d0e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 18 Oct 2011 05:50:42 +0000 Subject: Correct dependency rule to fix SPL build Commit 4750884 introduced a change in the dependency generation which breaks SPL, because the source files being built are not initially present and are symlinked as part of the build. The .depend file must depend not only on the files in the DEPS list but also on the sources which did not contribute files to the DEPS list, since these sources will otherwise not get a dependency and will not be built. Signed-off-by: Simon Glass Tested-by: Wolfgang Denk --- rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rules.mk') diff --git a/rules.mk b/rules.mk index 22562f33da..fa929f9f50 100644 --- a/rules.mk +++ b/rules.mk @@ -38,7 +38,8 @@ DEPS := $(basename $(patsubst %,$(obj).depend.%,$(PWD_SRCS))) # 1 .Concatenate all the generated depend files together # 2. Add in the deps from OTHER_SRCS which we couldn't process # 3. Add in the HOSTSRCS -$(obj).depend: $(src)Makefile $(TOPDIR)/config.mk $(DEPS) $(HOSTSRCS) +$(obj).depend: $(src)Makefile $(TOPDIR)/config.mk $(DEPS) $(OTHER_SRCS) \ + $(HOSTSRCS) cat /dev/null $(DEPS) >$@ @for f in $(OTHER_SRCS); do \ g=`basename $$f | sed -e 's/\(.*\)\.[[:alnum:]_]/\1.o/'`; \ -- cgit v1.2.1