| Message ID | 1405428722-31624-2-git-send-email-grinberg@compulab.co.il |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Jul 15, 2014 at 03:52:00PM +0300, Igor Grinberg wrote: > Commit 9e41403 (kbuild: change out-of-tree build) > changed the U-Boot build working directory to the output tree > for the out-of-tree builds. > This broke the {c,e}tags/cscope build targets as TAG_SUBDIRS variable > collected directories based on assumption that the build working > directory is the U-Boot source tree directory. > > Fix the {c,e}tags/cscope build targets by adding the $(srctree) prefix. > Also, remove the $(obj) prefix from the etags build target to finish > the $(obj) prefix removal started by the same commit. > > Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> > Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Applied to u-boot/master, thanks!
diff --git a/Makefile b/Makefile index 5277781..26b29d1 100644 --- a/Makefile +++ b/Makefile @@ -1137,7 +1137,7 @@ spl/sunxi-spl.bin: spl/u-boot-spl tpl/u-boot-tpl.bin: tools prepare $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all CONFIG_TPL_BUILD=y -TAG_SUBDIRS := $(u-boot-dirs) include +TAG_SUBDIRS := $(patsubst %,$(srctree)/%,$(u-boot-dirs) include) FIND := find FINDFLAGS := -L @@ -1147,7 +1147,7 @@ tags ctags: -name '*.[chS]' -print` etags: - etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \ + etags -a -o etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \ -name '*.[chS]' -print` cscope: $(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \
Commit 9e41403 (kbuild: change out-of-tree build) changed the U-Boot build working directory to the output tree for the out-of-tree builds. This broke the {c,e}tags/cscope build targets as TAG_SUBDIRS variable collected directories based on assumption that the build working directory is the U-Boot source tree directory. Fix the {c,e}tags/cscope build targets by adding the $(srctree) prefix. Also, remove the $(obj) prefix from the etags build target to finish the $(obj) prefix removal started by the same commit. Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)