X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8a702c602da0dd25f4baa5b9058dd521d3deeb63..b6c697be74102c9b20edf3d94c90b90cdb1ab994:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 1a218df58..40b4efc04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-# 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 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
@@ -18,175 +17,80 @@
 # 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
-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
+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
-
-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
-include $(TOPDIR)/rules.mk
+endif
+export OPENWRTVERSION
 
 all: world
 
-##############################################################
-#
-# Build the toolchain
-#
-##############################################################
-toolchain_install:
-	$(MAKE) -C toolchain install
-
-##############################################################
-#
-# Make all packages
-#
-##############################################################
+.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
 
-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.
-#
-#############################################################
+pkginfo-clean: FORCE
+	-rm -f .pkginfo .config.in
 
+scripts/config/mconf: .config.in
+	$(MAKE) -C scripts/config all
 
-# In this section, we need .config
-include .config.cmd
+scripts/config/conf: .config.in
+	$(MAKE) -C scripts/config conf
 
-world: $(DL_DIR) $(BUILD_DIR) target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index
+config: scripts/config/conf
+	$< Config.in
 
-.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install
+defdconfig: scripts/config/conf
+	$< -d Config.in
 
-package_index:
-	$(STAGING_DIR)/usr/bin/ipkg-make-index $(PACKAGE_DIR) > $(PACKAGE_DIR)/Packages
+oldconfig: scripts/config/conf
+	$< -o Config.in
 
-target_prepare:
-	$(MAKE) -C target prepare
+menuconfig: scripts/config/mconf
+	$< Config.in
 
-target_install:
-	$(MAKE) -C target install
+config-clean:
+	$(MAKE) -C scripts/config clean
 
-$(DL_DIR):
-	@mkdir -p $(DL_DIR)
+package/%: .pkginfo
+	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-$(BUILD_DIR):
-	@mkdir -p $(BUILD_DIR)
+target/%: .pkginfo
+	$(MAKE) -C target $(patsubst target/%,%,$@)
 
-source: $(TARGETS_SOURCE)
+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 $(TARGET_DIR)
-
-clean: target_clean
-	@$(MAKE) -C $(CONFIG) clean
-
-dirclean: clean
-	rm -rf $(STAMP_DIR)
-	$(MAKE) -C package clean
-	$(MAKE) -C target 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
+world:
+	$(MAKE) toolchain/install
+	$(MAKE) target/compile
+	$(MAKE) package/compile
+	$(MAKE) package/install
+	$(MAKE) target/install
 
+.PHONY: FORCE
+FORCE: