Makefile: refactor tools-all targets

- Move "easylogo", "gdb" tagets to tools/Makefile - Delete "gdbtools" target (same as "gdb") Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Makefile: refactor tools-all targets
- Move "easylogo", "gdb" tagets to tools/Makefile - Delete "gdbtools" target (same as "gdb") Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 3f76e98417
Showing 2 changed files with 10 additions and 6 deletions Side-by-side Diff
Makefile
tools/Makefile
@@ -1092,16 +1092,14 @@
 		@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:
@@ -24,6 +24,9 @@
 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,11 +183,14 @@
  
 __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
...	...	@@ -1092,16 +1092,14 @@
1092	1092	@LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
1093	1093	@cmp -s $@ $@.tmp && rm -f $@.tmp \|\| mv -f $@.tmp $@
1094	1094
1095		-easylogo env gdb:
	1095	+env: depend scripts_basic
1096	1096	$(Q)$(MAKE) $(build)=tools/$@
1097	1097
1098		-gdbtools: gdb
1099		-
1100	1098	xmldocs pdfdocs psdocs htmldocs mandocs: tools/kernel-doc/docproc
1101	1099	$(Q)$(MAKE) U_BOOT_VERSION=$(U_BOOT_VERSION) $(build)=doc/DocBook $@
1102	1100
1103		-tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
1104		- $(Q)$(MAKE) $(build)=tools HOST_TOOLS_ALL=y
	1101	+tools-all: HOST_TOOLS_ALL=y
	1102	+tools-all: env tools ;
1105	1103
1106	1104	.PHONY : CHANGELOG
1107	1105	CHANGELOG:
...	...	@@ -24,6 +24,9 @@
24	24	CONFIG_SHA1_CHECK_UB_IMG = y
25	25	endif
26	26
	27	+subdir-$(HOST_TOOLS_ALL) += easylogo
	28	+subdir-$(HOST_TOOLS_ALL) += gdb
	29	+
27	30	# Merge all the different vars for envcrc into one
28	31	ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
29	32	ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y
30	33
...	...	@@ -180,11 +183,14 @@
180	183
181	184	__build: $(LOGO-y)
182	185
183		-subdir-y := kernel-doc
	186	+subdir-y += kernel-doc
184	187
185	188	$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
186	189	$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
187	190
188	191	$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
189	192	$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
	193	+
	194	+# Let clean descend into subdirs
	195	+subdir- += env