add missing dependancy

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index ef60ff1..6df34ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,195 +1,133 @@
-# Makefile for OpenWRT
+# Makefile for OpenWrt

 #
 #

-# Copyright (C) 2005 by Felix Fietkau <nbd@vd-s.ath.cx>
-# 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=${shell pwd}
-export TOPDIR
-CONFIG_CONFIG_IN = Config.in
-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
+
+all: world
+
+export TOPDIR=${shell pwd}
+include $(TOPDIR)/include/verbose.mk
+
+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
 endif

+export OPENWRTVERSION

 
 

-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-include $(TOPDIR)/rules.mk
+ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
+  .pkginfo .config: FORCE
+endif

 
 

-all: world
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: .prereq-build
+  world: .prereq-packages
+endif

 
 

-##############################################################
-#
-# Build the toolchain
-#
-##############################################################
-toolchain_install:
-       $(MAKE) -C toolchain install
+.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 || echo "ERROR: please fix $${dir}Makefile" >&2; \
+       done > $@

 
 

-##############################################################
-#
-# Make all packages
-#
-##############################################################
+pkginfo-clean: FORCE
+       -rm -f .pkginfo .config.in

 
 

-package_install: toolchain
-       $(MAKE) -C package compile install
+.config.in: .pkginfo
+       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@

 
 

-#############################################################
-#
-# You should probably leave this stuff alone unless you know
-# what you are doing.
-#
-#############################################################
+.config: ./scripts/config/conf .config.in
+       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
+       @$< -D .config Config.in &> /dev/null

 
 

+scripts/config/mconf:
+       @$(MAKE) -C scripts/config all

 
 

-# In this section, we need .config
-include .config.cmd
+scripts/config/conf:
+       @$(MAKE) -C scripts/config conf

 
 

-world: $(DL_DIR) $(BUILD_DIR) configtest target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index
+config: scripts/config/conf .config.in FORCE
+       $< Config.in

 
 

-.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install configtest
+config-clean: FORCE
+       $(NO_TRACE_MAKE) -C scripts/config clean

 
 

-configtest:
-       -cp .config .config.test
-       -scripts/configtest.pl
+defconfig: scripts/config/conf .config.in FORCE
+       touch .config
+       $< -D .config Config.in

 
 

-package_index:
-       (cd $(PACKAGE_DIR); \
-               $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
-       )
+oldconfig: scripts/config/conf .config.in FORCE
+       $< -o Config.in

 
 

-target_prepare:
-       $(MAKE) -C target prepare
+menuconfig: scripts/config/mconf .config.in FORCE
+       $< Config.in

 
 

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

 
 

-$(DL_DIR):
-       @mkdir -p $(DL_DIR)
+target/%: .pkginfo FORCE
+       $(MAKE) -C target $(patsubst target/%,%,$@)

 
 

-$(BUILD_DIR):
-       @mkdir -p $(BUILD_DIR)
+toolchain/%: FORCE
+       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)

 
 

-source: $(TARGETS_SOURCE)
+.prereq-build: 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 $@

 
 

-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-image_clean:
-       rm -f $(STAMP_DIR)/.*-compile
-       rm -f $(STAMP_DIR)/.*-install
-       rm -rf $(BIN_DIR)
+.prereq-packages: include/prereq.mk .pkginfo .config
+       @$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
+               echo "Prerequisite check failed. Use FORCE=1 to override."; \
+               false; \
+       }
+       @rm -rf "$(TOPDIR)/tmp"
+       @touch $@

        
        

-target_clean: image_clean
-       rm -rf $(TARGET_DIR)
+prereq: .prereq-build .prereq-packages FORCE
+
+download: .config FORCE
+       $(MAKE) toolchain/download
+       $(MAKE) package/download
+       $(MAKE) target/download

 
 

-clean: target_clean
-       @$(MAKE) -C $(CONFIG) clean
+world: .config FORCE
+       $(MAKE) toolchain/install
+       $(MAKE) target/compile
+       $(MAKE) package/compile
+       $(MAKE) package/install
+       $(MAKE) target/install
+       $(MAKE) package/index
+
+clean: FORCE
+       rm -rf build_* bin

 
 dirclean: clean
 
 dirclean: clean

-       rm -rf $(BUILD_DIR)
-
-distclean: clean
-       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR)
-       rm -f .config* .tmpconfig.h
-
-sourceball: distclean
-       set -e; \
-       cd ..; \
-       rm -f buildroot.tar.bz2; \
-       tar -cvf buildroot.tar buildroot; \
-       bzip2 -9 buildroot.tar; \
-
-else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-
-all: menuconfig
-
-# configuration
-# ---------------------------------------------------------------------------
-
-$(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; \
-       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
-       #@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
-       #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config
-       -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
+       rm -rf staging_dir_* toolchain_build_*
+
+distclean: dirclean config-clean
+       rm -rf dl .*config* .pkg* .prereq

 
 

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