X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5115abb64a067aead31b82baa3bd35a48445c7f3..e89df49f6e22475b5348c7d0156111a982a1b976:/openwrt/Makefile diff --git a/openwrt/Makefile b/openwrt/Makefile index 1a218df58..cd9423314 100644 --- a/openwrt/Makefile +++ b/openwrt/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,16 +78,25 @@ 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: - $(STAGING_DIR)/usr/bin/ipkg-make-index $(PACKAGE_DIR) > $(PACKAGE_DIR)/Packages + (cd $(PACKAGE_DIR); \ + $(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 @@ -107,13 +125,10 @@ clean: target_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 $(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