[U-Boot] [PATCH v9 32/38] Makefile: refactor tools-all targets

Masahiro Yamada
2014-02-04T08:24:39Z

- Move "easylogo", "gdb" tagets to tools/Makefile
- Delete "gdbtools" target (same as "gdb")

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Revive "env" target

Changes in v4: None
Changes in v3: None
Changes in v2: None

Makefile | 8 +++-----
tools/Makefile | 8 +++++++-
2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e09f853..c3e1cfa 100644
--- a/Makefile
+++ b/Makefile
@@ -1092,16 +1092,14 @@ $(TIMESTAMP_FILE):
@LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@

-easylogo env gdb:
+env: depend scripts_basic
$(Q)$(MAKE) $(build)=tools/$@

-gdbtools: gdb
-
xmldocs pdfdocs psdocs htmldocs mandocs: tools/kernel-doc/docproc
$(Q)$(MAKE) U_BOOT_VERSION=$(U_BOOT_VERSION) $(build)=doc/DocBook $@

-tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
- $(Q)$(MAKE) $(build)=tools HOST_TOOLS_ALL=y
+tools-all: HOST_TOOLS_ALL=y
+tools-all: env tools ;

.PHONY : CHANGELOG
CHANGELOG:
diff --git a/tools/Makefile b/tools/Makefile
index 70a3fc2..783e643 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -24,6 +24,9 @@ CONFIG_NETCONSOLE = y
CONFIG_SHA1_CHECK_UB_IMG = y
endif

+subdir-$(HOST_TOOLS_ALL) += easylogo
+subdir-$(HOST_TOOLS_ALL) += gdb
+
# Merge all the different vars for envcrc into one
ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y
@@ -180,10 +183,13 @@ HOST_EXTRACFLAGS += -include $(SRCTREE)/include/libfdt_env.h \

__build: $(LOGO-y)

-subdir-y := kernel-doc
+subdir-y += kernel-doc

$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@

$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
+
+# Let clean descend into subdirs
+subdir- += env
--
1.8.3.2