updates from whiterussian

[openwrt.git] / openwrt / Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index e966188..45a9ba7 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -61,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

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


@@ -71,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


@@ -88,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


@@ -102,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


@@ -114,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