change wget timeout options to --timeout= for compatibility

[openwrt.git] / openwrt / Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 04a07dd..fd2a4ad 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
 


@@ -69,9 +73,13 @@ 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) target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index
+world: $(DL_DIR) $(BUILD_DIR) configtest target_prepare $(TARGET_DIR) 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_prepare target_install toolchain_install package_install
+configtest:
+       -cp .config .config.test
+       -scripts/configtest.pl

 
 package_index:
        (cd $(PACKAGE_DIR); \
 
 package_index:
        (cd $(PACKAGE_DIR); \


@@ -109,13 +117,10 @@ clean: target_clean
        @$(MAKE) -C $(CONFIG) clean
 
 dirclean: 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 $(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