projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (...
[openwrt.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 9b358c3b7a79309b2e2513b5f6596de7dd2ef24c..f4b153c17e2bb3bb11999874f898de6d497b49fc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,9
+21,6
@@
SHELL:=/usr/bin/env bash
export LC_ALL=C
export LANG=C
export TOPDIR=${CURDIR}
export LC_ALL=C
export LANG=C
export TOPDIR=${CURDIR}
-ifeq ($(KBUILD_VERBOSE),99)
- MAKE:=3>/dev/null $(MAKE)
-endif
export IS_TTY=$(shell tty -s && echo 1 || echo 0)
include $(TOPDIR)/include/verbose.mk
export IS_TTY=$(shell tty -s && echo 1 || echo 0)
include $(TOPDIR)/include/verbose.mk
@@
-41,98
+38,87
@@
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-package
s
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 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="" SCAN_TARGET_DEPS="$(wildcard target/*/Makefile include/kernel*.mk)" SCAN_EXTRA=""
+ $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(wildcard package/*/Makefile include/package*.mk include/kernel.mk)" SCAN_EXTRA=""
tmpinfo-clean: FORCE
tmpinfo-clean: FORCE
- @-rm -rf tmp/.pkginfo tmp/.targetinfo
-
-tmp/.config.in: tmp/.pkginfo
- @./scripts/metadata.pl package_config < $< > $@ || rm -f $@
+ -rm -rf tmp/.*info
-tmp/.config-
target.in: tmp/.targetinfo
-
@./scripts/metadata.pl target
_config < $< > $@ || rm -f $@
+tmp/.config-
%.in: tmp/.%info scripts/metadata.pl
+
./scripts/metadata.pl $*
_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
-package/%:
- @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
- $(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%:
- @$(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/.target
info .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-package
s
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
@@
-155,22
+141,22
@@
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 symlinkclean docclean
+distclean: dirclean config-clean symlinkclean doc
s/
clean
rm -rf dl
help:
cat README
rm -rf dl
help:
cat README
-doc
:
- $(MAKE) -C docs
/ openwrt.pdf
+doc
s docs/compile: FORCE
+ $(MAKE) -C docs
compile
-doc
clean:
- $(MAKE) -C docs
/
clean
+doc
s/clean: FORCE
+ $(MAKE) -C docs clean
symlinkclean:
symlinkclean:
- find package -type l | xargs rm -f
+ -find package -type l | xargs rm -f
+ rm -rf tmp
-.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
-%: ;