updates from whiterussian

[openwrt.git] / openwrt / Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index ef60ff1..45a9ba7 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -24,7 +24,11 @@
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR

+ifneq ($(DEVELOPER),)
+CONFIG_CONFIG_IN = Config.in.devel
+else

 CONFIG_CONFIG_IN = Config.in
 CONFIG_CONFIG_IN = Config.in

+endif

 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 
 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 


@@ -41,6 +45,8 @@ include $(TOPDIR)/rules.mk
 
 all: world
 
 
 all: world
 

+.NOTPARALLEL:
+

 ##############################################################
 #
 # Build the toolchain
 ##############################################################
 #
 # Build the toolchain


@@ -55,8 +61,11 @@ toolchain_install:
 #
 ##############################################################
 
 #
 ##############################################################
 

-package_install: toolchain
-       $(MAKE) -C package compile install
+package_compile: target_compile
+       $(MAKE) -C package compile
+
+package_install: package_compile toolchain
+       $(MAKE) -C package install

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


@@ -65,13 +74,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 package_install 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 target_install toolchain_install package_install configtest

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


@@ -82,8 +90,8 @@ 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_compile:
+       $(MAKE) -C target compile

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


@@ -96,6 +104,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


@@ -108,6 +126,7 @@ image_clean:
        
 target_clean: image_clean
        rm -rf $(TARGET_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


@@ -116,7 +135,7 @@ dirclean: clean
        rm -rf $(BUILD_DIR)
 
 distclean: 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
        rm -f .config* .tmpconfig.h
 
 sourceball: distclean