X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=8a052674b4d5c9b14d64b688532dd341a78d7f93;hp=5b966b752c9dec85fb763ba7213954315f7e4840;hb=6ce0261ebb837dace1b59494f650637cd5d28688;hpb=785609e573cf594b772c439d57e150da6dacc745

diff --git a/Makefile b/Makefile
index 5b966b752..8a052674b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,106 +1,57 @@
 # Makefile for OpenWrt
 #
-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2006 by Felix Fietkau <openwrt@nbd.name>
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
-RELEASE:=Kamikaze
-#VERSION:=2.0 # uncomment for final release
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+IS_TTY:=${shell tty -s && echo 1 || echo 0}
+export TOPDIR LC_ALL LANG IS_TTY
 
-#--------------------------------------------------------------
-# Just run 'make menuconfig', configure stuff, then run 'make'.
-# You shouldn't need to mess with anything beyond this point...
-#--------------------------------------------------------------
-TOPDIR=${shell pwd}
-export TOPDIR
-include $(TOPDIR)/include/verbose.mk
+world:
 
-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
-
-all: world
-
-.pkginfo: FORCE
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.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 2>&- || true; \
-	done > $@
-endif
-
-.config.in: .pkginfo
-	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
-
-pkginfo-clean: FORCE
-	-rm -f .pkginfo .config.in
-
-./scripts/config/mconf: .config.in
-	@$(MAKE) -C scripts/config all
-
-./scripts/config/conf: .config.in
-	@$(MAKE) -C scripts/config conf
-
-config: ./scripts/config/conf FORCE
-	$< Config.in
-
-defconfig: ./scripts/config/conf FORCE
-	touch .config
-	$< -D .config Config.in
+include $(TOPDIR)/include/debug.mk
+include $(TOPDIR)/include/host.mk
 
-oldconfig: ./scripts/config/conf FORCE
-	$< -o Config.in
-
-menuconfig: ./scripts/config/mconf FORCE
-	$< Config.in
-
-config-clean: FORCE
-	$(MAKE) -C scripts/config clean
-
-package/%: .pkginfo FORCE
-	$(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%: .pkginfo FORCE
-	$(MAKE) -C target $(patsubst target/%,%,$@)
-
-toolchain/%: FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+ifneq ($(OPENWRT_BUILD),1)
+  override OPENWRT_BUILD=1
+  export OPENWRT_BUILD
+  include $(TOPDIR)/include/toplevel.mk
+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)
 
-.config: ./scripts/config/conf FORCE
-	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-	@$< -D .config Config.in &> /dev/null
+clean: FORCE
+	rm -rf build_* bin tmp
 
-download: .config FORCE
-	$(MAKE) toolchain/download
-	$(MAKE) package/download
-	$(MAKE) target/download
+dirclean: clean
+	rm -rf staging_dir_* toolchain_build_* tool_build
 
-world: .config FORCE
-	$(MAKE) toolchain/install
-	$(MAKE) target/compile
-	$(MAKE) package/compile
-	$(MAKE) package/install
-	$(MAKE) target/install
+distclean: dirclean 
+	rm -rf dl .config*
 
-clean: FORCE
-	rm -rf build_* bin
+# check prerequisites before starting to build
+prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
 
-dirclean: clean
-	rm -rf staging_dir_* toolchain_build_*
+world: .config $(tools/stamp-install) $(toolchain/stamp-install) $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
+	$(MAKE) package/index
 
-distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg*
+package/symlinks:
+	$(SCRIPT_DIR)/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV)	
 
-.PHONY: FORCE
-FORCE:
+endif