Skip to content
Snippets Groups Projects
Commit eaeecde7 authored by Simon Glass's avatar Simon Glass Committed by Wolfgang Denk
Browse files

Correct dependency rule to fix SPL build


Commit 47508843 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: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarWolfgang Denk <wd@denx.de>
parent efb2172e
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,8 @@ DEPS := $(basename $(patsubst %,$(obj).depend.%,$(PWD_SRCS))) ...@@ -38,7 +38,8 @@ DEPS := $(basename $(patsubst %,$(obj).depend.%,$(PWD_SRCS)))
# 1 .Concatenate all the generated depend files together # 1 .Concatenate all the generated depend files together
# 2. Add in the deps from OTHER_SRCS which we couldn't process # 2. Add in the deps from OTHER_SRCS which we couldn't process
# 3. Add in the HOSTSRCS # 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) >$@ cat /dev/null $(DEPS) >$@
@for f in $(OTHER_SRCS); do \ @for f in $(OTHER_SRCS); do \
g=`basename $$f | sed -e 's/\(.*\)\.[[:alnum:]_]/\1.o/'`; \ g=`basename $$f | sed -e 's/\(.*\)\.[[:alnum:]_]/\1.o/'`; \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment