X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=92b84bb2a748ff07c8d12d9f2a42fa3f32e25b9a;hp=6df34ac771e3432416c0031df78d414dbdf88f09;hb=389529fe3599b90544f09cdae2d6318eefbe2352;hpb=9400d6fadd75f5c971eae160f0daaf45969ade42

diff --git a/Makefile b/Makefile
index 6df34ac77..92b84bb2a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,110 +7,38 @@
 # See /LICENSE for more information.
 #
 
-RELEASE:=Kamikaze
-#VERSION:=2.0 # uncomment for final release
-
-#--------------------------------------------------------------
-# Just run 'make menuconfig', configure stuff, then run 'make'.
-# You shouldn't need to mess with anything beyond this point...
-#--------------------------------------------------------------
-
 all: world
 
-export TOPDIR=${shell pwd}
-include $(TOPDIR)/include/verbose.mk
-
-OPENWRTVERSION:=$(RELEASE)
-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
-else
-  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
-endif
-export OPENWRTVERSION
-
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-  .pkginfo .config: FORCE
-endif
-
-ifeq ($(FORCE),)
-  .config scripts/config/conf scripts/config/mconf: .prereq-build
-  world: .prereq-packages
-endif
-
-.pkginfo:
-	@echo Collecting package info...
-	@-for dir in package/*/; do \
-		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir || echo "ERROR: please fix $${dir}Makefile" >&2; \
-	done > $@
-
-pkginfo-clean: FORCE
-	-rm -f .pkginfo .config.in
-
-.config.in: .pkginfo
-	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
-
-.config: ./scripts/config/conf .config.in
-	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-	@$< -D .config Config.in &> /dev/null
-
-scripts/config/mconf:
-	@$(MAKE) -C scripts/config all
 
-scripts/config/conf:
-	@$(MAKE) -C scripts/config conf
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+IS_TTY:=${shell tty -s && echo 1 || echo 0}
+export TOPDIR LC_ALL LANG IS_TTY
 
-config: scripts/config/conf .config.in FORCE
-	$< Config.in
+include rules.mk
 
-config-clean: FORCE
-	$(NO_TRACE_MAKE) -C scripts/config clean
-
-defconfig: scripts/config/conf .config.in FORCE
-	touch .config
-	$< -D .config Config.in
-
-oldconfig: scripts/config/conf .config.in FORCE
-	$< -o Config.in
-
-menuconfig: scripts/config/mconf .config.in FORCE
-	$< Config.in
-
-package/%: .pkginfo FORCE
-	$(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%: .pkginfo FORCE
-	$(MAKE) -C target $(patsubst target/%,%,$@)
+ifneq ($(OPENWRT_BUILD),1)
+  export OPENWRT_BUILD:=1
+  include $(INCLUDE_DIR)/toplevel.mk
+else
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include tools/Makefile
 
-toolchain/%: FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+clean: FORCE
+	rm -rf build_* bin tmp
 
-.prereq-build: include/prereq-build.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 $@
+dirclean: clean
+	rm -rf staging_dir_* toolchain_build_* tool_build
 
-.prereq-packages: include/prereq.mk .pkginfo .config
-	@$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
-		echo "Prerequisite check failed. Use FORCE=1 to override."; \
-		false; \
-	}
-	@rm -rf "$(TOPDIR)/tmp"
-	@touch $@
-	
-prereq: .prereq-build .prereq-packages FORCE
+distclean: dirclean config-clean symlinkclean docs/clean
+	rm -rf dl
 
-download: .config FORCE
-	$(MAKE) toolchain/download
-	$(MAKE) package/download
-	$(MAKE) target/download
+toolchain/% package/% target/%: FORCE
+	$(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-world: .config FORCE
+world: .config $(tools/stamp) FORCE
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile
@@ -118,16 +46,4 @@ world: .config FORCE
 	$(MAKE) target/install
 	$(MAKE) package/index
 
-clean: FORCE
-	rm -rf build_* bin
-
-dirclean: clean
-	rm -rf staging_dir_* toolchain_build_*
-
-distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg* .prereq
-
-.SILENT: clean dirclean distclean config-clean download world
-FORCE: ;
-.PHONY: FORCE
-%: ;
+endif