Fresh fixes for rdc from sn9, thanks !

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index d7e4585..3187f72 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,32 +47,30 @@ endif
 package/%/Makefile: ;
 target/%/Makefile: ;
 
 package/%/Makefile: ;
 target/%/Makefile: ;
 

-tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) 
-tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)  FORCE

 tmp/.%info:
 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=""
+       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/.*info
+       -rm -rf tmp/.*info

 
 tmp/.config-%.in: tmp/.%info
 
 tmp/.config-%.in: tmp/.%info

-       @./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
-
-
+       ./scripts/metadata.pl $*_config < $< > $@ || rm -f $@

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

-       @[ -f .config ] || { \
+       if [ \! -f .config ]; then \

                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                $(NO_TRACE_MAKE) menuconfig; \
                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                $(NO_TRACE_MAKE) menuconfig; \

-       }
-       @$< -D .config Config.in &> /dev/null
+       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

 
 
 
 
 
 


@@ -90,7 +88,7 @@ oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORC
        $< -o Config.in
 
 menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE
        $< -o Config.in
 
 menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE

-       @if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \

                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in


@@ -107,22 +105,22 @@ package/% target/% tools/% toolchain/%: FORCE
 
 
 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 || { \
+       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-%: include/prereq.mk tmp/.%info .config
 
 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 || { \
+       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-package tmp/.prereq-target FORCE
 
 
 prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
 


@@ -162,6 +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 help
+.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