kbuild: change out-of-tree build

[karo-tx-uboot.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index b36de4daa2b4db45d4a43dcf987fe4128581c56e..e4fd3371df52eff0a5d24f3c772133db778478c8 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -6,41 +6,42 @@
 #
 #########################################################################
 
-_depend:       $(obj).depend
+_depend:       $(obj)/.depend
 
 # Split the source files into two camps: those in the current directory, and
 # those somewhere else. For the first camp we want to support CPPFLAGS_<fname>
 # and for the second we don't / can't.
-PWD_SRCS := $(filter $(notdir $(SRCS)),$(SRCS))
-OTHER_SRCS := $(filter-out $(notdir $(SRCS)),$(SRCS))
+PWD_SRCS := $(foreach f,$(SRCS), $(if \
+       $(filter $(if $(KBUILD_SRC),$(srctree)/)$(src)/$(notdir $f),$f), $f))
+OTHER_SRCS := $(filter-out $(PWD_SRCS),$(SRCS))
 
 # This is a list of dependency files to generate
-DEPS := $(basename $(patsubst %,$(obj).depend.%,$(PWD_SRCS)))
+DEPS := $(basename $(addprefix $(obj)/.depend., $(notdir $(PWD_SRCS))))
 
 # Join all the dependencies into a single file, in three parts
 #      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) $(OTHER_SRCS) \
+$(obj)/.depend:        $(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/'`; \
-               $(CC) -M $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \
+               $(CC) -M $(CPPFLAGS) -MQ $(obj)/$$g $$f >> $@ ; \
        done
        @for f in $(HOSTSRCS); do \
                g=`basename $$f | sed -e 's/\(.*\)\.[[:alnum:]_]/\1.o/'`; \
-               $(HOSTCC) -M $(HOSTCPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \
+               $(HOSTCC) -M $(HOSTCPPFLAGS) -MQ $(obj)/$$g $$f >> $@ ; \
        done
 
 MAKE_DEPEND = $(CC) -M $(CPPFLAGS) $(EXTRA_CPPFLAGS_DEP) \
                -MQ $(addsuffix .o,$(obj)$(basename $<)) $< >$@
 
 
-$(obj).depend.%:       %.c
+$(obj)/.depend.%:      $(src)/%.c
        $(MAKE_DEPEND)
 
-$(obj).depend.%:       %.S
+$(obj)/.depend.%:      $(src)/%.S
        $(MAKE_DEPEND)
 
 #########################################################################