projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make the build work properly by including Hostap modules.
[openwrt.git] / Makefile
diff --git a/Makefile b/Makefile
index 86367fe..fe10e07 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,180 +1,133 @@
 # Makefile for OpenWrt
 #
 # 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...
 #--------------------------------------------------------------
 #--------------------------------------------------------------
 # 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
+all: world
+
+export TOPDIR=${shell pwd}
+include $(TOPDIR)/include/verbose.mk
+
+OPENWRTVERSION:=$(RELEASE)
+ifneq ($(VERSION),)
+  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
 else
 else
-CONFIG_CONFIG_IN = Config.in
+  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
+  ifneq ($(REV),)
+    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
+  endif
 endif
 endif
-CONFIG_DEFCONFIG = .defconfig
-CONFIG = package/config
-
-noconfig_targets := menuconfig config oldconfig randconfig \
-       defconfig allyesconfig allnoconfig release tags
+export OPENWRTVERSION
 
 
-# Pull in the user's configuration file
-ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR)/.config
+ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
+  .pkginfo .config: FORCE
 endif
 
 endif
 
-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-include $(TOPDIR)/rules.mk
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: .prereq-build
+  world: .prereq-packages
+endif
 
 
-all: world
+.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 > $@
 
 
-.NOTPARALLEL:
+pkginfo-clean: FORCE
+       -rm -f .pkginfo .config.in
 
 
-#############################################################
-#
-# You should probably leave this stuff alone unless you know
-# what you are doing.
-#
-#############################################################
+.config.in: .pkginfo
+       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
 
 
-# In this section, we need .config
-include .config.cmd
+.config: ./scripts/config/conf
+       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
+       @$< -D .config Config.in &> /dev/null
 
 
-world: $(DL_DIR) $(BUILD_DIR) configtest 
-       $(MAKE) toolchain/install target/compile package/compile root_clean package/install target/install package_index
+scripts/config/mconf:
+       @$(MAKE) -C scripts/config all
 
 
-.PHONY: all world clean dirclean distclean image_clean target_clean source configtest
+scripts/config/conf:
+       @$(MAKE) -C scripts/config conf
 
 
-configtest:
-       -cp .config .config.test
-       -scripts/configtest.pl
+config: scripts/config/conf .config.in FORCE
+       $< Config.in
 
 
-package_index:
-       (cd $(PACKAGE_DIR); $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages)
+config-clean: FORCE
+       $(NO_TRACE_MAKE) -C scripts/config clean
 
 
-$(DL_DIR):
-       @mkdir -p $(DL_DIR)
+defconfig: scripts/config/conf .config.in FORCE
+       touch .config
+       $< -D .config Config.in
 
 
-$(BUILD_DIR):
-       @mkdir -p $(BUILD_DIR)
+oldconfig: scripts/config/conf .config.in FORCE
+       $< -o Config.in
 
 
-source: toolchain/source package/source target/source
+menuconfig: scripts/config/mconf .config.in FORCE
+       $< Config.in
 
 
-package/%:
-       @$(TRACE) $@
+package/%: .pkginfo FORCE
        $(MAKE) -C package $(patsubst package/%,%,$@)
 
        $(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%:
-       @$(TRACE) $@
+target/%: .pkginfo FORCE
        $(MAKE) -C target $(patsubst target/%,%,$@)
 
        $(MAKE) -C target $(patsubst target/%,%,$@)
 
-toolchain/%:
-       @$(TRACE) $@
+toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-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)
-
-clean: dirclean
-
-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
-
-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
-       -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
-
+.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 $@
+
+.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 $@
+       
+prereq: .prereq-build .prereq-packages FORCE
+
+download: .config FORCE
+       $(MAKE) toolchain/download
+       $(MAKE) package/download
+       $(MAKE) target/download
+
+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
+       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
+%: ;
Personal OpenWRT clone
This page took 0.028061 seconds and 4 git commands to generate.