X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=fbed1297a1eb6c8fd915a0afc3579504af563bc6;hp=39ffb17fb5e770c8c6983feee5ef3568388665a2;hb=af927159a9e65228875999840012a1cde1c36b6a;hpb=f52d66ff00b24111f87c274d3d7085ef2e1d27b1

diff --git a/Makefile b/Makefile
index 39ffb17fb..fbed1297a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,141 +1,69 @@
 # 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...
-#--------------------------------------------------------------
+world:
 
-all: world
+include $(TOPDIR)/include/debug.mk
+include $(TOPDIR)/include/host.mk
 
-SHELL:=/usr/bin/env bash
-export TOPDIR=${shell pwd}
-include $(TOPDIR)/include/verbose.mk
-
-OPENWRTVERSION:=$(RELEASE)
-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+ifneq ($(OPENWRT_BUILD),1)
+  override OPENWRT_BUILD=1
+  export OPENWRT_BUILD
+  include $(TOPDIR)/include/toplevel.mk
 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
-
-config: scripts/config/conf .config.in FORCE
-	$< Config.in
-
-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/%,%,$@)
+  include rules.mk
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include package/Makefile
+  include tools/Makefile
+  include toolchain/Makefile
 
-target/%: .pkginfo FORCE
-	$(MAKE) -C target $(patsubst target/%,%,$@)
+clean: FORCE
+	rm -rf build_* bin tmp
 
-tools/%: FORCE
-	$(MAKE) -C tools $(patsubst tools/%,%,$@)
+dirclean: clean
+	rm -rf staging_dir_* toolchain_build_* tool_build
 
-toolchain/%: FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+distclean: dirclean config-clean symlinkclean docs/clean
+	rm -rf dl
 
-.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."; \
-		rm -rf $(TOPDIR)/tmp; \
-		false; \
-	}
-	@rm -rf $(TOPDIR)/tmp
-	@touch $@
-
-.prereq-packages: include/prereq.mk .pkginfo .config
-	@$(NO_TRACE_MAKE) -s -C package 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
+target/%: FORCE
+	$(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-download: .config FORCE
-	$(MAKE) tools/download
-	$(MAKE) toolchain/download
-	$(MAKE) package/download
-	$(MAKE) target/download
+# check prerequisites before starting to build
+prereq: tmp/.prereq-target $(package/stamp-prereq) ;
 
-world: .config FORCE
-	$(MAKE) tools/install
-	$(MAKE) toolchain/install
+world: .config $(tools/stamp-install) $(toolchain/stamp-install) FORCE
 	$(MAKE) target/compile
 	$(MAKE) package/compile
 	$(MAKE) package/install
 	$(MAKE) target/install
 	$(MAKE) package/index
 
-clean: FORCE
-	rm -rf build_* bin
-
-dirclean: clean
-	rm -rf staging_dir_* toolchain_build_* tool_build
+package/symlinks:
+	$(SCRIPT_DIR)/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV)	
 
-distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg* .prereq 
+# 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
 
-.SILENT: clean dirclean distclean config-clean download world
-FORCE: ;
-.PHONY: FORCE
-%: ;
+endif