diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-28 13:29:03 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-28 13:29:03 +0000 |
| commit | 23660965c9671a573d958374ce1ef0b7c5b317b8 (patch) | |
| tree | c8a6a0f65801669d0749e819d2c5cc4ae410076e /Makefile | |
| parent | 389529fe3599b90544f09cdae2d6318eefbe2352 (diff) | |
build system fixes, more cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8207 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -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 |