X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0b1d6144082f12667f1e06d4602701ca39f0c2ab..5ca8302d76986d4e4a9b5933fee8114792a44b8c:/openwrt/Makefile?ds=inline diff --git a/openwrt/Makefile b/openwrt/Makefile index 8342bab86..1b8d968a0 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 ############################################################# # @@ -65,13 +74,16 @@ 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 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); \ @@ -81,6 +93,9 @@ package_index: target_prepare: $(MAKE) -C target prepare +target_compile: + $(MAKE) -C target compile + target_install: $(MAKE) -C target install @@ -92,6 +107,16 @@ $(BUILD_DIR): 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 @@ -104,6 +129,7 @@ image_clean: target_clean: image_clean rm -rf $(TARGET_DIR) + rm -rf $(BUILD_DIR)/linux-*/root clean: target_clean @$(MAKE) -C $(CONFIG) clean @@ -112,7 +138,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