aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-04-07 13:30:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-04-07 13:30:57 +0000
commitdfa0901b98eb2a6e5473ddd92b1441bfbbc990c8 (patch)
treeebd7b34e4e4613ffed7864e867af87d3df2b45d4
parente66c304cb9849c3fa68a3e4eca64820e019e5f2d (diff)
downloadupstream-dfa0901b98eb2a6e5473ddd92b1441bfbbc990c8.tar.gz
upstream-dfa0901b98eb2a6e5473ddd92b1441bfbbc990c8.tar.bz2
upstream-dfa0901b98eb2a6e5473ddd92b1441bfbbc990c8.zip
make a few commands silent and fix defconfig logic
SVN-Revision: 6886
-rw-r--r--Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 3596bcd84a..e2d5c1450f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,20 +50,18 @@ target/%/Makefile: ;
tmp/.packageinfo: FORCE
tmp/.targetinfo: 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="$^" 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="$^" SCAN_EXTRA=""
tmpinfo-clean: FORCE
-rm -rf 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
- if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
- cp $(HOME)/.openwrt/defconfig .config; \
+ if [ \! -f .config ]; then \
+ [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
$(NO_TRACE_MAKE) menuconfig; \
fi
$< -D .config Config.in &> /dev/null