X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=Makefile;h=c3e1ed77076feec19eeb171a780fa895a5dca6d8;hp=fea8ed316230cd1d44bc4c278d9a6476e0587a23;hb=916aebb300e9e9215723dd9a3892d91ba5695411;hpb=509bb267a32dbc4f9a663683e1de42e3fec31e63

diff --git a/Makefile b/Makefile
index fea8ed3162..c3e1ed7707 100644
--- a/Makefile
+++ b/Makefile
@@ -1,197 +1,92 @@
 # 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
+TZ:=UTC
+export TOPDIR LC_ALL LANG TZ
 
-#--------------------------------------------------------------
-# Just run 'make menuconfig', configure stuff, then run 'make'.
-# You shouldn't need to mess with anything beyond this point...
-#--------------------------------------------------------------
+empty:=
+space:= $(empty) $(empty)
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces))
 
-all: world
+world:
 
-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)
+include $(TOPDIR)/include/host.mk
 
-include $(TOPDIR)/include/verbose.mk
+ifneq ($(OPENWRT_BUILD),1)
+  _SINGLE=export MAKEFLAGS=$(space);
 
-OPENWRTVERSION:=$(RELEASE)
-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+  override OPENWRT_BUILD=1
+  export OPENWRT_BUILD
+  GREP_OPTIONS=
+  export GREP_OPTIONS
+  include $(TOPDIR)/include/debug.mk
+  include $(TOPDIR)/include/depends.mk
+  include $(TOPDIR)/include/toplevel.mk
 else
-  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
-endif
-export OPENWRTVERSION
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
-  tmp/.pkginfo: FORCE
-endif
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
-  tmp/.targetinfo: FORCE
-endif
-
-ifeq ($(FORCE),)
-  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: tmp/.prereq-packages tmp/.prereq-target
-endif
-
-ifeq ($(IS_TTY),1)
-  define progress
-	printf "\033[M\r$(1)" >&2;
-  endef
-endif
-
-define dumpinfo
-	@mkdir -p tmp
-	@echo -n Collecting $(2) info... 
-	@-for dir in $(1)/*/; do \
-		[ -f "$${dir}/Makefile" ] || continue; \
-		$(call progress,Collecting $(2) info: $${dir%%/}) \
-		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-		echo; \
-	done > $@
-	@($(call progress,Collecting $(2) info: done))
-	@echo
-endef
-
-tmp/.pkginfo:
-	$(call dumpinfo,package,package)
-
-tmp/.targetinfo:
-	$(call dumpinfo,target/linux,target)
-
-tmpinfo-clean: FORCE
-	@-rm -rf tmp/.pkginfo tmp/.targetinfo
-
-tmp/.config.in: tmp/.pkginfo
-	@./scripts/metadata.pl package_config < $< > $@ || rm -f $@
-
-tmp/.config-target.in: tmp/.targetinfo
-	@./scripts/metadata.pl target_config < $< > $@ || rm -f $@
-
-.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
-	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-	@$< -D .config Config.in &> /dev/null
-
-scripts/config/mconf:
-	@$(MAKE) -C scripts/config all
-
-scripts/config/conf:
-	@$(MAKE) -C scripts/config conf
-
-config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
-	$< Config.in
-
-config-clean: FORCE
-	$(NO_TRACE_MAKE) -C scripts/config clean
+  include rules.mk
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include target/Makefile
+  include package/Makefile
+  include tools/Makefile
+  include toolchain/Makefile
 
-defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
-	touch .config
-	$< -D .config Config.in
+$(toolchain/stamp-install): $(tools/stamp-install)
+$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared
+$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
+$(package/stamp-install): $(package/stamp-compile)
+$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
 
-oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
-	$< -o Config.in
+printdb:
+	@true
 
-menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
-	$< Config.in
+prepare: $(target/stamp-compile)
 
-kernel_menuconfig: .config FORCE
-	-$(MAKE) target/linux-prepare
-	$(NO_TRACE_MAKE) -C target/linux menuconfig
-
-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
-	$(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%: tmp/.pkginfo tmp/.targetinfo FORCE
-	$(MAKE) -C target $(patsubst target/%,%,$@)
-
-tools/%: FORCE
-	$(MAKE) -C tools $(patsubst tools/%,%,$@)
-
-toolchain/%: tmp/.targetinfo FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+clean: FORCE
+	rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR)
 
-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 $@
+dirclean: clean
+	rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
+	rm -rf $(TMP_DIR)
 
-tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config
-	@mkdir -p tmp
-	@rm -f tmp/.host.mk
-	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
-		echo "Prerequisite check failed. Use FORCE=1 to override."; \
-		false; \
-	}
+ifndef DUMP_TARGET_DB
+$(BUILD_DIR)/.prepared: Makefile
+	@mkdir -p $$(dirname $@)
 	@touch $@
 
-tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config
-	@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."; \
+tmp/.prereq_packages: .config
+	unset ERROR; \
+	for package in $(sort $(prereq-y) $(prereq-m)); do \
+		$(_SINGLE)$(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \
+	done; \
+	if [ -n "$$ERROR" ]; then \
+		echo "Package prerequisite check failed."; \
 		false; \
-	}
-	@touch $@
-
-prereq: tmp/.prereq-build tmp/.prereq-packages 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
-	rm -rf dl
+	fi
+	touch $@
+endif
 
-help:
-	cat README
+# check prerequisites before starting to build
+prereq: $(target/stamp-prereq) tmp/.prereq_packages
+	@if [ ! -f "$(INCLUDE_DIR)/site/$(ARCH)" ]; then \
+		echo 'ERROR: Missing site config for architecture "$(ARCH)" !'; \
+		echo '       The missing file will cause configure scripts to fail during compilation.'; \
+		echo '       Please provide a "$(INCLUDE_DIR)/site/$(ARCH)" file and restart the build.'; \
+		exit 1; \
+	fi
 
-doc:
-	$(MAKE) -C docs/ openwrt.pdf
+prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
+world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
+	$(_SINGLE)$(SUBMAKE) -r package/index
 
-docclean:
-	$(MAKE) -C docs/ clean
+.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean
 
-.SILENT: clean dirclean distclean config-clean download world
-FORCE: ;
-.PHONY: FORCE help
-%: ;
+endif