X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=cd9423314937b2e7ca45a585419b085397c95dc0;hb=9053c0d6b31dd89b1c395247766063f84efc0117;hp=8342bab86bb294760e1fe4829abf5871816921a3;hpb=8baff275a97784c559ba94179bcfbf145ea2ae57;p=openwrt-10.03%2F.git diff --git a/Makefile b/Makefile index 8342bab86..cd9423314 100644 --- a/Makefile +++ b/Makefile @@ -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,6 +45,8 @@ include $(TOPDIR)/rules.mk all: world +.NOTPARALLEL: + ############################################################## # # 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 ############################################################# # @@ -69,9 +78,13 @@ 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 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 +.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install configtest + +configtest: + -cp .config .config.test + -scripts/configtest.pl package_index: (cd $(PACKAGE_DIR); \ @@ -81,6 +94,9 @@ package_index: target_prepare: $(MAKE) -C target prepare +target_compile: + $(MAKE) -C target compile + target_install: $(MAKE) -C target install @@ -112,7 +128,7 @@ dirclean: 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