Fresh fixes for rdc from sn9, thanks !

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 05c4f45..3187f72 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,101 +41,88 @@ export OPENWRTVERSION
 
 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
 

-tmp/.pkginfo: FORCE
-       @mkdir -p tmp/info
-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(shell ls include/package*.mk) include/kernel.mk" SCAN_EXTRA=""
+package/%/Makefile: ;
+target/%/Makefile: ;

 
 

-tmp/.targetinfo: FORCE
-       @mkdir -p tmp/info
-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="$(shell ls include/kernel*.mk)" SCAN_EXTRA=""
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)  FORCE
+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="$(filter FORCE, $^)" SCAN_EXTRA=""

 
 tmpinfo-clean: FORCE
 
 tmpinfo-clean: FORCE

-       @-rm -rf tmp/.pkginfo tmp/.targetinfo
+       -rm -rf tmp/.*info

 
 

-tmp/.config.in: tmp/.pkginfo
-       @./scripts/metadata.pl package_config < $< > $@ || rm -f $@
+tmp/.config-%.in: tmp/.%info
+       ./scripts/metadata.pl $*_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
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       @$< -D .config Config.in &> /dev/null
+.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
+       if [ \! -f .config ]; then \
+               [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
+               $(NO_TRACE_MAKE) menuconfig; \
+       fi
+       $< -D .config Config.in &> /dev/null

 
 scripts/config/mconf:
 
 scripts/config/mconf:

-       @$(MAKE) -C scripts/config all
+       $(MAKE) -C scripts/config all

 
 scripts/config/conf:
 
 scripts/config/conf:

-       @$(MAKE) -C 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
+       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+               cp $(HOME)/.openwrt/defconfig .config; \
+       fi

        $< Config.in
 
 kernel_menuconfig: .config FORCE
        -$(MAKE) target/linux-prepare
        $(NO_TRACE_MAKE) -C target/linux menuconfig
 
        $< Config.in
 
 kernel_menuconfig: .config FORCE
        -$(MAKE) target/linux-prepare
        $(NO_TRACE_MAKE) -C target/linux menuconfig
 

-scan_packages:
-       @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
-       
-
-package/%: scan_packages
-       $(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%: scan_packages
-       @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
-       $(MAKE) -C target $(patsubst target/%,%,$@)

 
 

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

 
 

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

 
 tmp/.prereq-build: include/prereq-build.mk
 
 tmp/.prereq-build: include/prereq-build.mk

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

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

-       @touch $@
+       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 || { \
+tmp/.prereq-%: include/prereq.mk tmp/.%info .config
+       mkdir -p tmp
+       rm -f tmp/.host.mk
+       $(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \

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

-       @touch $@
+       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


@@ -173,7 +160,6 @@ docclean:
 symlinkclean:
        find package -type l -exec rm -f {} +
 
 symlinkclean:
        find package -type l -exec rm -f {} +
 

-.SILENT: clean dirclean distclean symlinkclean config-clean download world
+.SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target

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

-%: ;