summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-30 21:14:08 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-30 21:14:08 +0000
commit196ad55bd2bdad8c5c86249afd4b1cec04855d35 (patch)
tree4c27d19447167e10ac4a4589830a46b794048164 /Makefile
parent6814b92ca911e1113c6527475627aeda700bdb10 (diff)
next round of cleanup, convert target/ - make -j works now ;)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8242 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile30
1 files changed, 9 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index fbed1297a..50cf8c985 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,17 @@ else
include rules.mk
include $(INCLUDE_DIR)/depends.mk
include $(INCLUDE_DIR)/subdir.mk
+ include $(INCLUDE_DIR)/target.mk
+ include target/Makefile
include package/Makefile
include tools/Makefile
include toolchain/Makefile
+$(toolchain/stamp-compile): $(tools/stamp-compile)
+$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install)
+$(package/stamp-compile): $(target/stamp-compile)
+$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
+
clean: FORCE
rm -rf build_* bin tmp
@@ -38,32 +45,13 @@ dirclean: clean
distclean: dirclean config-clean symlinkclean docs/clean
rm -rf dl
-target/%: FORCE
- $(MAKE) -C $(patsubst %/$*,%,$@) $*
-
# check prerequisites before starting to build
-prereq: tmp/.prereq-target $(package/stamp-prereq) ;
+prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
-world: .config $(tools/stamp-install) $(toolchain/stamp-install) FORCE
- $(MAKE) target/compile
- $(MAKE) package/compile
- $(MAKE) package/install
- $(MAKE) target/install
+world: .config $(tools/stamp-install) $(toolchain/stamp-install) $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
$(MAKE) package/index
package/symlinks:
$(SCRIPT_DIR)/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV)
-# FIXME: remove after converting target/ to new structure
-tmp/.prereq-target: tmp/.targetinfo .config
-tmp/.prereq-target: include/prereq.mk
- mkdir -p tmp
- rm -f tmp/.host.mk
- @+$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \
- echo "Prerequisite check failed. Use FORCE=1 to override."; \
- false; \
- }
- touch $@
-.SILENT: tmp/.prereq-target
-
endif