small image builder change

[openwrt.git] / openwrt / Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index fd2a4ad..d478227 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -1,6 +1,6 @@
 # Makefile for OpenWRT
 #
 # 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
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify


@@ -45,22 +45,7 @@ include $(TOPDIR)/rules.mk
 
 all: world
 
 
 all: world
 

-##############################################################
-#
-# Build the toolchain
-#
-##############################################################
-toolchain_install:
-       $(MAKE) -C toolchain install
-
-##############################################################
-#
-# Make all packages
-#
-##############################################################
-
-package_install: toolchain
-       $(MAKE) -C package compile install
+.NOTPARALLEL:

 
 #############################################################
 #
 
 #############################################################
 #


@@ -69,13 +54,12 @@ package_install: toolchain
 #
 #############################################################
 
 #
 #############################################################
 

-

 # In this section, we need .config
 include .config.cmd
 
 # In this section, we need .config
 include .config.cmd
 

-world: $(DL_DIR) $(BUILD_DIR) configtest 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 configtest
+.PHONY: all world clean dirclean distclean image_clean target_clean source configtest

 
 configtest:
        -cp .config .config.test
 
 configtest:
        -cp .config .config.test


@@ -86,12 +70,6 @@ package_index:
                $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
        )
 
                $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
        )
 

-target_prepare:
-       $(MAKE) -C target prepare
-
-target_install:
-       $(MAKE) -C target install
-

 $(DL_DIR):
        @mkdir -p $(DL_DIR)
 
 $(DL_DIR):
        @mkdir -p $(DL_DIR)
 


@@ -100,6 +78,16 @@ $(BUILD_DIR):
 
 source: $(TARGETS_SOURCE)
 
 
 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
 #############################################################
 #
 # Cleanup and misc junk


@@ -111,7 +99,7 @@ image_clean:
        rm -rf $(BIN_DIR)
        
 target_clean: 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
 
 clean: target_clean
        @$(MAKE) -C $(CONFIG) clean


@@ -173,8 +161,6 @@ randconfig: $(CONFIG)/conf
        -./scripts/configtest.pl
 
 allyesconfig: $(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)
        -touch .config
        -cp .config .config.test
        @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)