Cleanups on romboot and u-boot.

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index b1970b0..414a152 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,55 +39,29 @@ else
 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 

-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
-  tmp/.pkginfo: FORCE
-endif
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
-  tmp/.targetinfo: FORCE
-endif
-

 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build

-  world: tmp/.prereq-packages tmp/.prereq-target
+  world: tmp/.prereq-package tmp/.prereq-target

 endif
 
 endif
 

-ifeq ($(IS_TTY),1)
-  define progress
-       printf "\033[M\r$(1)" >&2;
-  endef
-endif
+package/%/Makefile: ;
+target/%/Makefile: ;

 
 

-define dumpinfo
-       @mkdir -p tmp
-       @echo -n Collecting $(2) info... 
-       @-for dir in $(1)/*/; do \
-               [ -f "$${dir}/Makefile" ] || continue; \
-               $(call progress,Collecting $(2) info: $${dir%%/}) \
-               echo Source-Makefile: $${dir}Makefile; \
-               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-               echo; \
-       done > $@
-       @($(call progress,Collecting $(2) info: done))
-       @echo
-endef
-
-tmp/.pkginfo:
-       $(call dumpinfo,package,package)
-
-tmp/.targetinfo:
-       $(call dumpinfo,target/linux,target)
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) 
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)
+tmp/.%info:
+       @mkdir -p tmp/info
+       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA=""

 
 tmpinfo-clean: FORCE
 
 tmpinfo-clean: FORCE

-       @-rm -rf tmp/.pkginfo tmp/.targetinfo
+       @-rm -rf tmp/.*info
+
+tmp/.config-%.in: tmp/.%info
+       @./scripts/metadata.pl $*_config < $< > $@ || rm -f $@

 
 

-tmp/.config.in: tmp/.pkginfo
-       @./scripts/metadata.pl package_config < $< > $@ || rm -f $@

 
 

-tmp/.config-target.in: tmp/.targetinfo
-       @./scripts/metadata.pl target_config < $< > $@ || rm -f $@

 
 

-.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
+.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in

        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 


@@ -97,37 +71,34 @@ scripts/config/mconf:
 scripts/config/conf:
        @$(MAKE) -C scripts/config conf
 
 scripts/config/conf:
        @$(MAKE) -C scripts/config conf
 

-config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+
+
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE

        $< Config.in
 
 config-clean: FORCE
        $(NO_TRACE_MAKE) -C scripts/config clean
 
        $< Config.in
 
 config-clean: FORCE
        $(NO_TRACE_MAKE) -C scripts/config clean
 

-defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+defconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE

        touch .config
        $< -D .config Config.in
 
        touch .config
        $< -D .config Config.in
 

-oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE

        $< -o Config.in
 
        $< -o Config.in
 

-menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
+menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE

        $< Config.in
 
 kernel_menuconfig: .config FORCE
        $< Config.in
 
 kernel_menuconfig: .config FORCE

-       $(MAKE) target/linux-prepare
+       -$(MAKE) target/linux-prepare

        $(NO_TRACE_MAKE) -C target/linux menuconfig
 
        $(NO_TRACE_MAKE) -C target/linux menuconfig
 

-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)

 
 

-target/%: tmp/.pkginfo tmp/.targetinfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% tools/% toolchain/%: FORCE
+       $(MAKE) -C $(patsubst %/$*,%,$@) $*

 
 

-tools/%: FORCE
-       $(MAKE) -C tools $(patsubst tools/%,%,$@)
-
-toolchain/%: tmp/.targetinfo FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)

 
 tmp/.prereq-build: include/prereq-build.mk
        @mkdir -p tmp
 
 tmp/.prereq-build: include/prereq-build.mk
        @mkdir -p tmp


@@ -138,25 +109,16 @@ tmp/.prereq-build: include/prereq-build.mk
        }
        @touch $@
 
        }
        @touch $@
 

-tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config
+tmp/.prereq-%: include/prereq.mk tmp/.%info .config

        @mkdir -p tmp
        @rm -f tmp/.host.mk
        @mkdir -p tmp
        @rm -f tmp/.host.mk

-       @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+       @$(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \

                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
        @touch $@
 
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
        @touch $@
 

-tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config
-       @mkdir -p tmp
-       @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       @touch $@
-
-prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE

 
 download: .config FORCE
        $(MAKE) tools/download
 
 download: .config FORCE
        $(MAKE) tools/download


@@ -179,7 +141,7 @@ clean: FORCE
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 

-distclean: dirclean config-clean
+distclean: dirclean config-clean symlinkclean docclean

        rm -rf dl
 
 help:
        rm -rf dl
 
 help:


@@ -191,7 +153,9 @@ doc:
 docclean:
        $(MAKE) -C docs/ clean
 
 docclean:
        $(MAKE) -C docs/ clean
 

-.SILENT: clean dirclean distclean config-clean download world
+symlinkclean:
+       find package -type l -exec rm -f {} +
+
+.SILENT: clean dirclean distclean symlinkclean config-clean download world help

 FORCE: ;
 .PHONY: FORCE help
 FORCE: ;
 .PHONY: FORCE help

-%: ;