From 23660965c9671a573d958374ce1ef0b7c5b317b8 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 28 Jul 2007 13:29:03 +0000
Subject: build system fixes, more cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8207 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 92b84bb2a..6703d90d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # 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.
@@ -9,22 +8,21 @@
 
 all: world
 
-
 TOPDIR:=${CURDIR}
 LC_ALL:=C
 LANG:=C
 IS_TTY:=${shell tty -s && echo 1 || echo 0}
 export TOPDIR LC_ALL LANG IS_TTY
 
-include rules.mk
-
 ifneq ($(OPENWRT_BUILD),1)
   export OPENWRT_BUILD:=1
-  include $(INCLUDE_DIR)/toplevel.mk
+  include $(TOPDIR)/include/toplevel.mk
 else
+  include rules.mk
   include $(INCLUDE_DIR)/depends.mk
   include $(INCLUDE_DIR)/subdir.mk
   include tools/Makefile
+  include toolchain/Makefile
 
 clean: FORCE
 	rm -rf build_* bin tmp
@@ -38,8 +36,7 @@ distclean: dirclean config-clean symlinkclean docs/clean
 toolchain/% package/% target/%: FORCE
 	$(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-world: .config $(tools/stamp) FORCE
-	$(MAKE) toolchain/install
+world: .config $(tools/stamp) $(toolchain/stamp) FORCE
 	$(MAKE) target/compile
 	$(MAKE) package/compile
 	$(MAKE) package/install
-- 
cgit v1.2.3