fix dependency problem

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a218df..d478227 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for OpenWRT
 #
-# Copyright (C) 2005 by Felix Fietkau <nbd@vd-s.ath.cx>
+# Copyright (C) 2005 by Felix Fietkau <openwrt@nbd.name>
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,11 @@
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
+ifneq ($(DEVELOPER),)
+CONFIG_CONFIG_IN = Config.in.devel
+else
 CONFIG_CONFIG_IN = Config.in
+endif
 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 
@@ -41,22 +45,7 @@ include $(TOPDIR)/rules.mk
 
 all: world
 
-##############################################################
-#
-# Build the toolchain
-#
-##############################################################
-toolchain_install:
-       $(MAKE) -C toolchain install
-
-##############################################################
-#
-# Make all packages
-#
-##############################################################
-
-package_install: toolchain
-       $(MAKE) -C package compile install
+.NOTPARALLEL:
 
 #############################################################
 #
@@ -65,22 +54,21 @@ package_install: toolchain
 #
 #############################################################
 
-
 # In this section, we need .config
 include .config.cmd
 
-world: $(DL_DIR) $(BUILD_DIR) target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index
+world: $(DL_DIR) $(BUILD_DIR) configtest toolchain/install target/compile package/compile target/install package_index
 
-.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install
+.PHONY: all world clean dirclean distclean image_clean target_clean source configtest
 
-package_index:
-       $(STAGING_DIR)/usr/bin/ipkg-make-index $(PACKAGE_DIR) > $(PACKAGE_DIR)/Packages
-
-target_prepare:
-       $(MAKE) -C target prepare
+configtest:
+       -cp .config .config.test
+       -scripts/configtest.pl
 
-target_install:
-       $(MAKE) -C target install
+package_index:
+       (cd $(PACKAGE_DIR); \
+               $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
+       )
 
 $(DL_DIR):
        @mkdir -p $(DL_DIR)
@@ -90,6 +78,16 @@ $(BUILD_DIR):
 
 source: $(TARGETS_SOURCE)
 
+
+package/%:
+       $(MAKE) -C package $(patsubst package/%,%,$@)
+
+target/%:
+       $(MAKE) -C target $(patsubst target/%,%,$@)
+
+toolchain/%:
+       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+
 #############################################################
 #
 # Cleanup and misc junk
@@ -101,19 +99,16 @@ image_clean:
        rm -rf $(BIN_DIR)
        
 target_clean: image_clean
-       rm -rf $(TARGET_DIR)
+       rm -rf $(BUILD_DIR)/linux-*/root
 
 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 -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
        rm -f .config* .tmpconfig.h
 
 sourceball: distclean
@@ -166,8 +161,6 @@ randconfig: $(CONFIG)/conf
        -./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)