diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-28 02:44:55 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-28 02:44:55 +0000 |
| commit | 7a209707c3e61b00ab1666d73778372fe4bb4790 (patch) | |
| tree | 671b2c7a134713861bd60e5b219ac389b46d2b14 /Makefile | |
| parent | 3ba84cb70821c6a2dd091bb2140b01abe31574a7 (diff) | |
initial attempt at cleaning up subdirectory handling. tools/Makefile is now being included instead of recursively called
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8201 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -23,7 +23,10 @@ export LANG=C export TOPDIR=${CURDIR} export IS_TTY=$(shell tty -s && echo 1 || echo 0) -include $(TOPDIR)/include/verbose.mk +include ./rules.mk +include $(INCLUDE_DIR)/depends.mk +include $(INCLUDE_DIR)/subdir.mk +include tools/Makefile OPENWRTVERSION:=$(RELEASE) ifneq ($(VERSION),) @@ -100,7 +103,7 @@ kernel_menuconfig: .config FORCE package/% target/%: tmp/.packageinfo toolchain/% package/% target/%: tmp/.targetinfo -package/% target/% tools/% toolchain/%: FORCE +package/% target/% toolchain/%: FORCE $(MAKE) -C $(patsubst %/$*,%,$@) $* @@ -130,8 +133,7 @@ download: .config FORCE $(MAKE) package/download $(MAKE) target/download -world: .config FORCE - $(MAKE) tools/install +world: .config $(tools/stamp) FORCE $(MAKE) toolchain/install $(MAKE) target/compile $(MAKE) package/compile @@ -162,5 +164,4 @@ symlinkclean: rm -rf tmp .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 +.PHONY: help |