bugfix for the rb532 block2mtd code

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 43ee3dd..a23f478 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,205 +1,132 @@
-# Makefile for buildroot2
+# Makefile for OpenWrt

 #
 #

-# 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...
 #--------------------------------------------------------------
 #--------------------------------------------------------------
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------

-TOPDIR=./
-CONFIG_CONFIG_IN = Config.in
-CONFIG_DEFCONFIG = .defconfig
-CONFIG = package/config
-
-noconfig_targets := menuconfig config oldconfig randconfig \
-       defconfig allyesconfig allnoconfig release tags
+TOPDIR=${shell pwd}
+export TOPDIR
+include $(TOPDIR)/include/verbose.mk

 
 

-# Pull in the user's configuration file
-ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR).config
-endif
-
-ifeq ($(BR2_TAR_VERBOSITY),y)
-TAR_OPTIONS=-xvf
+OPENWRTVERSION:=$(RELEASE)
+ifneq ($(VERSION),)
+OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))

 else
 else

-TAR_OPTIONS=-xf
+REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
+ifneq ($(REV),)
+OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)

 endif
 endif

+endif
+export OPENWRTVERSION

 
 

-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-
-#############################################################
-#
-# The list of stuff to build for the target toolchain
-# along with the packages to build for the target.
-#
-##############################################################
-TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils
-TARGETS+=linux
-
-include toolchain/Makefile.in
-include package/Makefile.in
-
-#############################################################
-#
-# You should probably leave this stuff alone unless you know
-# what you are doing.
-#
-#############################################################
-
-
+all: world

 
 

-all:   world
+ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
+.pkginfo: FORCE
+.config: FORCE
+endif

 
 

-# In this section, we need .config
-include .config.cmd
+.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 > $@

 
 

-# We also need the various per-package makefiles, which also add
-# each selected package to TARGETS if that package was selected
-# in the .config file.
-include toolchain/*/*.mk
-include package/*/*.mk
-include target/*/*.mk
+.config.in: .pkginfo
+       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@

 
 

-# target stuff is last so it can override anything else
-include target/Makefile.in
+pkginfo-clean: FORCE
+       -rm -f .pkginfo .config.in

 
 

-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
-TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
+./scripts/config/mconf: .config.in
+       @$(MAKE) -C scripts/config all

 
 

-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+./scripts/config/conf: .config.in
+       @$(MAKE) -C scripts/config conf

 
 

-.PHONY: all world clean dirclean distclean source $(TARGETS) \
-       $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-       $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
+config: ./scripts/config/conf FORCE
+       $< Config.in

 
 

-#############################################################
-#
-# staging and target directories do NOT list these as
-# dependancies anywhere else
-#
-#############################################################
-$(DL_DIR):
-       @mkdir -p $(DL_DIR)
-
-$(BUILD_DIR):
-       @mkdir -p $(BUILD_DIR)
-
-$(TOOL_BUILD_DIR):
-       @mkdir -p $(TOOL_BUILD_DIR)
-
-$(STAGING_DIR):
-       @mkdir -p $(STAGING_DIR)/lib
-       @mkdir -p $(STAGING_DIR)/include
-       @mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-       @ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
-
-$(TARGET_DIR):
-       if [ -f "$(TARGET_SKELETON)" ] ; then \
-               zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
-       fi;
-       if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
-               cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
-       fi;
-       -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-       -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
-
-source: $(TARGETS_SOURCE)
-
-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-clean: 
-       rm -rf $(TARGET_DIR) $(IMAGE).*
-       $(MAKE) $(DIST)-image-clean
+defconfig: ./scripts/config/conf FORCE
+       touch .config
+       $< -D .config Config.in

 
 

-dirclean: $(TARGETS_DIRCLEAN)
-       rm -rf $(TARGET_DIR) $(IMAGE).*
-       $(MAKE) $(DIST)-image-clean
+oldconfig: ./scripts/config/conf FORCE
+       $< -o Config.in

 
 

-distclean: clean
-       rm -rf $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) 
-       rm .config* .tmpconfig.h
+menuconfig: ./scripts/config/mconf FORCE
+       $< Config.in

 
 

-sourceball:
-       rm -rf $(BUILD_DIR)
-       set -e; \
-       cd ..; \
-       rm -f buildroot.tar.bz2; \
-       tar -cvf buildroot.tar buildroot; \
-       bzip2 -9 buildroot.tar; \
+config-clean: FORCE
+       $(NO_TRACE_MAKE) -C scripts/config clean

 
 

+package/%: .pkginfo FORCE
+       $(MAKE) -C package $(patsubst package/%,%,$@)

 
 

-else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
+target/%: .pkginfo FORCE
+       $(MAKE) -C target $(patsubst target/%,%,$@)

 
 

-all: menuconfig
+toolchain/%: FORCE
+       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)

 
 

-# configuration
-# ---------------------------------------------------------------------------
+.config: ./scripts/config/conf
+       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
+       @$< -D .config Config.in &> /dev/null

 
 

-$(CONFIG)/conf:
-       $(MAKE) -C $(CONFIG) conf
-       -@if [ ! -f .config ] ; then \
-               cp $(CONFIG_DEFCONFIG) .config; \
-       fi
-$(CONFIG)/mconf:
-       $(MAKE) -C $(CONFIG) ncurses conf mconf
-       -@if [ ! -f .config ] ; then \
-               cp $(CONFIG_DEFCONFIG) .config; \
-       fi
+.prereq-build: $(TOPDIR)/include/prereq-build.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 $@

 
 

-menuconfig: $(CONFIG)/mconf
-       @$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
+.prereq-packages: $(TOPDIR)/include/prereq.mk .pkginfo .config
+       @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+               echo "Prerequisite check failed. Use FORCE=1 to override."; \
+               false; \
+       }
+       @touch $@
+       
+prereq: .prereq-build .prereq-packages FORCE

 
 

-config: $(CONFIG)/conf
-       @$(CONFIG)/conf $(CONFIG_CONFIG_IN)
+download: .config FORCE
+       $(MAKE) toolchain/download
+       $(MAKE) package/download
+       $(MAKE) target/download

 
 

-oldconfig: $(CONFIG)/conf
-       @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
-
-randconfig: $(CONFIG)/conf
-       @$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
-
-allyesconfig: $(CONFIG)/conf
-       #@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
-       #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config
-       @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
-
-allnoconfig: $(CONFIG)/conf
-       @$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
+ifeq ($(FORCE),)
+.config ./scripts/config/conf ./scripts/config/mconf: .prereq-build
+world: .prereq-packages
+endif

 
 

-defconfig: $(CONFIG)/conf
-       @$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
+world: .config FORCE
+       $(MAKE) toolchain/install
+       $(MAKE) target/compile
+       $(MAKE) package/compile
+       $(MAKE) package/install
+       $(MAKE) target/install

 
 

-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-clean:
-       @$(MAKE) -C $(CONFIG) clean
+clean: FORCE
+       rm -rf build_* bin

 
 

-distclean: clean
+dirclean: clean
+       rm -rf staging_dir_* toolchain_build_*

 
 

-endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
+distclean: dirclean config-clean
+       rm -rf dl .*config* .pkg* .prereq

 
 

-.PHONY: dummy subdirs release distclean clean config oldconfig \
-       menuconfig tags check test depend

 
 

+.SILENT: clean dirclean distclean config-clean download world
+.PHONY: FORCE
+FORCE: