fix install of in-tree modules ipkgs

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index d478227..40b4efc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-# 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 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
 #
 # 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


@@ -18,168 +17,80 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 

+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...
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
 #--------------------------------------------------------------
 # 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
+
+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

-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

 endif
 endif

-
-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-include $(TOPDIR)/rules.mk
+export OPENWRTVERSION

 
 all: world
 
 
 all: world
 

-.NOTPARALLEL:
-
-#############################################################
-#
-# You should probably leave this stuff alone unless you know
-# what you are doing.
-#
-#############################################################
+.pkginfo: FORCE
+ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
+       @echo Collecting package info...
+       @-for dir in package/*/; do \
+               echo Source-Makefile: $${dir}Makefile; \
+               $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
+       done > $@
+endif

 
 

-# In this section, we need .config
-include .config.cmd
+.config.in: .pkginfo
+       ./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@

 
 

-world: $(DL_DIR) $(BUILD_DIR) configtest toolchain/install target/compile package/compile target/install package_index
+pkginfo-clean: FORCE
+       -rm -f .pkginfo .config.in

 
 

-.PHONY: all world clean dirclean distclean image_clean target_clean source configtest
+scripts/config/mconf: .config.in
+       $(MAKE) -C scripts/config all

 
 

-configtest:
-       -cp .config .config.test
-       -scripts/configtest.pl
+scripts/config/conf: .config.in
+       $(MAKE) -C scripts/config conf

 
 

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

 
 

-$(DL_DIR):
-       @mkdir -p $(DL_DIR)
+defdconfig: scripts/config/conf
+       $< -d Config.in

 
 

-$(BUILD_DIR):
-       @mkdir -p $(BUILD_DIR)
+oldconfig: scripts/config/conf
+       $< -o Config.in

 
 

-source: $(TARGETS_SOURCE)
+menuconfig: scripts/config/mconf
+       $< Config.in

 
 

+config-clean:
+       $(MAKE) -C scripts/config clean

 
 

-package/%:
+package/%: .pkginfo

        $(MAKE) -C package $(patsubst package/%,%,$@)
 
        $(MAKE) -C package $(patsubst package/%,%,$@)
 

-target/%:
+target/%: .pkginfo

        $(MAKE) -C target $(patsubst target/%,%,$@)
 
 toolchain/%:
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
        $(MAKE) -C target $(patsubst target/%,%,$@)
 
 toolchain/%:
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 

-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-image_clean:
-       rm -f $(STAMP_DIR)/.*-compile
-       rm -f $(STAMP_DIR)/.*-install
-       rm -rf $(BIN_DIR)
-       
-target_clean: image_clean
-       rm -rf $(BUILD_DIR)/linux-*/root
-
-clean: target_clean
-       @$(MAKE) -C $(CONFIG) clean
-
-dirclean: clean
-       rm -rf $(BUILD_DIR)
-
-distclean: clean
-       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_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
-       -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
+world:
+       $(MAKE) toolchain/install
+       $(MAKE) target/compile
+       $(MAKE) package/compile
+       $(MAKE) package/install
+       $(MAKE) target/install

 
 

+.PHONY: FORCE
+FORCE: