fix build issues with SMP compiles

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index d82d618..e2e467c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,10 @@
 # Makefile for OpenWrt
 #
+# 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
@@ -26,6 +16,7 @@ RELEASE:=Kamikaze
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
+include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
@@ -38,37 +29,93 @@ endif
 endif
 export OPENWRTVERSION
 
-ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package)
-.pkginfo: pkginfo-clean
-endif
+all: world
 
-.pkginfo:
+.pkginfo: FORCE
+ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
        @echo Collecting package info...
-       @-for makefile in package/*/Makefile; do \
-               echo Source-Makefile: $$makefile; \
-               $(MAKE) DUMP=1 -f $$makefile 2>&- || true; \
+       @-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:
+pkginfo-clean: FORCE
        -rm -f .pkginfo .config.in
 
-scripts/config/mconf: .config.in
-       $(MAKE) -C scripts/config all
+./scripts/config/mconf: .config.in
+       @$(MAKE) -C scripts/config all
 
-scripts/config/conf: .config.in
-       $(MAKE) -C scripts/config conf
+./scripts/config/conf: .config.in
+       @$(MAKE) -C scripts/config conf
 
-menuconfig: scripts/config/mconf
+config: ./scripts/config/conf FORCE
        $< Config.in
 
-config: scripts/config/mconf
+defconfig: ./scripts/config/conf FORCE
+       touch .config
+       $< -D .config Config.in
+
+oldconfig: ./scripts/config/conf FORCE
+       $< -o Config.in
+
+menuconfig: ./scripts/config/mconf FORCE
        $< Config.in
 
-config-clean:
-       $(MAKE) -C scripts/config clean
+config-clean: FORCE
+       $(NO_TRACE_MAKE) -C scripts/config clean
+
+package/%: .pkginfo FORCE
+       $(MAKE) -C package $(patsubst package/%,%,$@)
+
+target/%: .pkginfo FORCE
+       $(MAKE) -C target $(patsubst target/%,%,$@)
+
+toolchain/%: FORCE
+       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+
+.config: ./scripts/config/conf FORCE
+       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
+       @$< -D .config Config.in &> /dev/null
+
+.prereq: $(TOPDIR)/include/prereq.mk .pkginfo
+       @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq.mk prereq 2>/dev/null || { \
+               echo "Prerequisite check failed. Use FORCE=1 to override."; \
+               false; \
+       }
+       @touch $@
+
+prereq: .prereq FORCE
+
+download: .config FORCE
+       $(MAKE) toolchain/download
+       $(MAKE) package/download
+       $(MAKE) target/download
+
+ifeq ($(FORCE),)
+world: .prereq
+endif
+
+world: .config FORCE
+       $(MAKE) toolchain/install
+       $(MAKE) target/compile
+       $(MAKE) package/compile
+       $(MAKE) package/install
+       $(MAKE) target/install
+
+clean: FORCE
+       rm -rf build_* bin
+
+dirclean: clean
+       rm -rf staging_dir_* toolchain_build_*
 
-.PHONY: pkginfo-clean
+distclean: dirclean config-clean
+       rm -rf dl .*config* .pkg* .prereq
 
 
+.SILENT: clean dirclean distclean config-clean download world
+.PHONY: FORCE
+FORCE: