X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=db79274c9af0e2f1b9666841a780fb5bc154854f;hp=7e43b443219fda97ed5f4363e04d680cea337599;hb=8abc063773dfb5f63b6a1bbc074d256fd7e5b661;hpb=187ca0602dd34161650ce10f051de47df3d9290e diff --git a/Makefile b/Makefile index 7e43b4432..db79274c9 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ ifneq ($(OPENWRT_BUILD),1) # but we can't include that file in this context empty:= space:= $(empty) $(empty) - _SINGLE=MAKEFLAGS=$(space) + _SINGLE=export MAKEFLAGS=$(space); override OPENWRT_BUILD=1 export OPENWRT_BUILD @@ -48,18 +48,20 @@ $(BUILD_DIR)/.prepared: Makefile @mkdir -p $$(dirname $@) @touch $@ +prepare: $(target/stamp-compile) + clean: FORCE - rm -rf $(BUILD_DIR) $(BIN_DIR) - $(SUBMAKE) target/linux/clean + $(_SINGLE)$(SUBMAKE) target/linux/clean + rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR) dirclean: clean - rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) + rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) rm -rf $(TMP_DIR) tmp/.prereq_packages: .config unset ERROR; \ for package in $(sort $(prereq-y) $(prereq-m)); do \ - $(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \ + $(_SINGLE)$(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \ done; \ if [ -n "$$ERROR" ]; then \ echo "Package prerequisite check failed."; \ @@ -72,7 +74,7 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE - $(SUBMAKE) package/index + $(_SINGLE)$(SUBMAKE) -r package/index # update all feeds, re-create index files, install symlinks package/symlinks: