X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=be53622cc18069c9882c8a0515af9f5d3d650258;hp=92a49bf9e81c9fe7abd8a56ebc34a80a3af85dd2;hb=3cd9eea04e166dc36dd0ecd4c1ebdf92ed76f8f2;hpb=db3abbe8740973d6cac46cb2128e949d198e3393

diff --git a/Makefile b/Makefile
index 92a49bf9e..be53622cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,108 +1,48 @@
 # Makefile for OpenWrt
 #
-# Copyright (C) 2006 by Felix Fietkau <openwrt@nbd.name>
+# Copyright (C) 2007 OpenWrt.org
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-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...
-#--------------------------------------------------------------
-TOPDIR=${shell pwd}
-export TOPDIR
-
-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; \
-		$(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
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+IS_TTY:=${shell tty -s && echo 1 || echo 0}
+export TOPDIR LC_ALL LANG IS_TTY
 
-./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
-
-oldconfig: ./scripts/config/conf FORCE
-	$< -o Config.in
+ifneq ($(OPENWRT_BUILD),1)
+  export OPENWRT_BUILD:=1
+  include $(TOPDIR)/include/toplevel.mk
+else
+  include $(TOPDIR)/include/host.mk
 
-menuconfig: ./scripts/config/mconf FORCE
-	$< Config.in
+  include rules.mk
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include tools/Makefile
+  include toolchain/Makefile
 
-config-clean: FORCE
-	$(MAKE) -C scripts/config clean
+clean: FORCE
+	rm -rf build_* bin tmp
 
-package/%: .pkginfo FORCE
-	$(MAKE) -C package $(patsubst package/%,%,$@)
+dirclean: clean
+	rm -rf staging_dir_* toolchain_build_* tool_build
 
-target/%: .pkginfo FORCE
-	$(MAKE) -C target $(patsubst target/%,%,$@)
+distclean: dirclean config-clean symlinkclean docs/clean
+	rm -rf dl
 
-toolchain/%: FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+package/% target/%: FORCE
+	$(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-world: ./scripts/config/conf FORCE
-	touch .config
-	$< -D .config Config.in >/dev/null 2>/dev/null
-	$(MAKE) toolchain/install
+world: .config $(tools/stamp) $(toolchain/stamp) 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_*
-
-distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg*
-
-.PHONY: FORCE
-FORCE:
+endif