X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=Makefile;h=d7e4585595c023c96a683f91505d7652abed486d;hp=edeb1f41ee5a9ea1d4491490f4799891725c5489;hb=81a817a5e3df246ca87520ee40a6ec00444fe5eb;hpb=cd45334873bf33da7101c954d1d7356f1e70e9e5

diff --git a/Makefile b/Makefile
index edeb1f41ee..d7e4585595 100644
--- a/Makefile
+++ b/Makefile
@@ -1,183 +1,167 @@
 # Makefile for OpenWrt
 #
-# Copyright (C) 2005 by Felix Fietkau <openwrt@nbd.name>
-# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006 by Felix Fietkau <openwrt@nbd.name>
 #
-# 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 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
+# 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
+
 #--------------------------------------------------------------
 # 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
-
-ifneq ($(DEVELOPER),)
-CONFIG_CONFIG_IN = Config.in.devel
-else
-CONFIG_CONFIG_IN = Config.in
-endif
-CONFIG_DEFCONFIG = .defconfig
-CONFIG = package/config
-
-noconfig_targets := menuconfig config oldconfig randconfig \
-	defconfig allyesconfig allnoconfig release tags
-
-# Pull in the user's configuration file
-ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR)/.config
-endif
-
-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-include $(TOPDIR)/rules.mk
 
 all: world
 
-.NOTPARALLEL:
-
-#############################################################
-#
-# You should probably leave this stuff alone unless you know
-# what you are doing.
-#
-#############################################################
+SHELL:=/usr/bin/env bash
+export LC_ALL=C
+export LANG=C
+export TOPDIR=${CURDIR}
+ifeq ($(KBUILD_VERBOSE),99)
+  MAKE:=3>/dev/null $(MAKE)
+endif
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
-# In this section, we need .config
-include .config.cmd
+include $(TOPDIR)/include/verbose.mk
 
-world: $(DL_DIR) $(BUILD_DIR) configtest 
-	$(MAKE) toolchain/install target/compile package/compile root_clean package/install target/install package_index
-	$(TRACE) Build complete.
+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
 
-.PHONY: all world clean dirclean distclean image_clean target_clean source configtest
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
+  world: tmp/.prereq-package tmp/.prereq-target
+endif
 
-configtest:
-	-cp .config .config.test
-	-scripts/configtest.pl
+package/%/Makefile: ;
+target/%/Makefile: ;
 
-package_index:
-	(cd $(PACKAGE_DIR); $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages)
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) 
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)
+tmp/.%info:
+	@mkdir -p tmp/info
+	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA=""
 
-$(DL_DIR):
-	@mkdir -p $(DL_DIR)
+tmpinfo-clean: FORCE
+	@-rm -rf tmp/.*info
 
-$(BUILD_DIR):
-	@mkdir -p $(BUILD_DIR)
+tmp/.config-%.in: tmp/.%info
+	@./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
-source: toolchain/source package/source target/source
 
-package/%:
-	@$(TRACE) $@
-	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%:
-	@$(TRACE) $@
-	$(MAKE) -C target $(patsubst target/%,%,$@)
+.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
+	@[ -f .config ] || { \
+		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
+		$(NO_TRACE_MAKE) menuconfig; \
+	}
+	@$< -D .config Config.in &> /dev/null
 
-toolchain/%:
-	@$(TRACE) $@
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+scripts/config/mconf:
+	@$(MAKE) -C scripts/config all
 
-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-root_clean:
-	@$(TRACE) root_clean
-	rm -rf $(BUILD_DIR)/linux-*/root $(BUILD_DIR)/root
-
-target_clean: root_clean
-	rm -f $(STAMP_DIR)/.*-compile
-	rm -f $(STAMP_DIR)/.*-install
-	rm -rf $(BIN_DIR)
+scripts/config/conf:
+	@$(MAKE) -C scripts/config conf
 
-clean: dirclean
 
-dirclean:
-	@$(TRACE) dirclean
-	@$(MAKE) -C $(CONFIG) clean
-	rm -rf $(BUILD_DIR)
 
-distclean: dirclean
-	rm -rf $(STAMP_DIR) $(DL_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
-	rm -f .config* .tmpconfig.h
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
+	$< Config.in
 
-else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
+config-clean: FORCE
+	$(NO_TRACE_MAKE) -C scripts/config clean
 
-all: menuconfig
+defconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
+	touch .config
+	$< -D .config Config.in
 
-# configuration
-# ---------------------------------------------------------------------------
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
+	$< -o Config.in
 
-$(CONFIG)/conf:
-	$(MAKE) -C $(CONFIG) conf
-	-@if [ ! -f .config ] ; then \
-		cp $(CONFIG_DEFCONFIG) .config; \
-	fi
-$(CONFIG)/mconf:
-	$(MAKE) -C $(CONFIG) 
-	-@if [ ! -f .config ] ; then \
-		cp $(CONFIG_DEFCONFIG) .config; \
+menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE
+	@if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+		cp $(HOME)/.openwrt/defconfig .config; \
 	fi
-
-menuconfig: $(CONFIG)/mconf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-config: $(CONFIG)/conf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/conf $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-oldconfig: $(CONFIG)/conf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-randconfig: $(CONFIG)/conf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-allyesconfig: $(CONFIG)/conf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-allnoconfig: $(CONFIG)/conf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-defconfig: $(CONFIG)/conf
-	-touch .config
-	-cp .config .config.test
-	@$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
-	-./scripts/configtest.pl
-
-endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-
-.PHONY: dummy subdirs release distclean clean config oldconfig \
-	menuconfig tags check test depend
-
+	$< Config.in
+
+kernel_menuconfig: .config FORCE
+	-$(MAKE) target/linux-prepare
+	$(NO_TRACE_MAKE) -C target/linux menuconfig
+
+
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% tools/% toolchain/%: FORCE
+	$(MAKE) -C $(patsubst %/$*,%,$@) $*
+
+
+tmp/.prereq-build: include/prereq-build.mk
+	@mkdir -p tmp
+	@rm -f tmp/.host.mk
+	@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
+		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		false; \
+	}
+	@touch $@
+
+tmp/.prereq-%: include/prereq.mk tmp/.%info .config
+	@mkdir -p tmp
+	@rm -f tmp/.host.mk
+	@$(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \
+		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		false; \
+	}
+	@touch $@
+
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
+
+download: .config FORCE
+	$(MAKE) tools/download
+	$(MAKE) toolchain/download
+	$(MAKE) package/download
+	$(MAKE) target/download
+
+world: .config FORCE
+	$(MAKE) tools/install
+	$(MAKE) toolchain/install
+	$(MAKE) target/compile
+	$(MAKE) package/compile
+	$(MAKE) package/install
+	$(MAKE) target/install
+	$(MAKE) package/index
+
+clean: FORCE
+	rm -rf build_* bin tmp
+
+dirclean: clean
+	rm -rf staging_dir_* toolchain_build_* tool_build
+
+distclean: dirclean config-clean symlinkclean docclean
+	rm -rf dl
+
+help:
+	cat README
+
+doc:
+	$(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+	$(MAKE) -C docs/ clean
+
+symlinkclean:
+	find package -type l -exec rm -f {} +
+
+.SILENT: clean dirclean distclean symlinkclean config-clean download world help
+FORCE: ;
+.PHONY: FORCE help