next round of build system cleanup - convert package/ to new structure

[openwrt-10.03/.git] / Makefile

diff --git a/Makefile b/Makefile
index 5c218f155f761ad163748febcd733d805af4fbc4..fbed1297a1eb6c8fd915a0afc3579504af563bc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,106 +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...
-#--------------------------------------------------------------
-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
+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 package/Makefile
+  include tools/Makefile
+  include toolchain/Makefile
 
-package/%: .pkginfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)
+clean: FORCE
+       rm -rf build_* bin tmp
 
-target/%: .pkginfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)
+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
 
-.config: ./scripts/config/conf FORCE
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       $< -D .config Config.in >/dev/null 2>/dev/null
+target/%: FORCE
+       $(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-download: .config FORCE
-       $(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) 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
+
+package/symlinks:
+       $(SCRIPT_DIR)/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV)        
+
+# 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
 
-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