X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Makefile;h=a12e3ea49a64d7337e648ac89e00655bf624e81b;hp=5257a990dcc6c6ab818489759aa8679ca3253ea4;hb=7dcd784158bc1aa93595a74f2acc92f4d2270c22;hpb=04b49fc7722f931a0c72d13a4a7055d8e59d0764 diff --git a/Makefile b/Makefile index 5257a990dc..a12e3ea49a 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,6 @@ world: include $(TOPDIR)/include/host.mk ifneq ($(OPENWRT_BUILD),1) - # XXX: these three lines are normally defined by rules.mk - # but we can't include that file in this context - empty:= - space:= $(empty) $(empty) _SINGLE=export MAKEFLAGS=$(space); override OPENWRT_BUILD=1 @@ -54,11 +50,10 @@ printdb: prepare: $(target/stamp-compile) clean: FORCE - $(_SINGLE)$(SUBMAKE) target/linux/clean - rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR) + rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(BUILD_LOG_DIR) dirclean: clean - rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) + rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) rm -rf $(TMP_DIR) ifndef DUMP_TARGET_DB @@ -80,10 +75,10 @@ endif # check prerequisites before starting to build prereq: $(target/stamp-prereq) tmp/.prereq_packages - @if [ ! -f "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" ]; then \ - echo 'ERROR: Missing site config for target "$(REAL_GNU_TARGET_NAME)" !'; \ + @if [ ! -f "$(INCLUDE_DIR)/site/$(ARCH)" ]; then \ + echo 'ERROR: Missing site config for architecture "$(ARCH)" !'; \ echo ' The missing file will cause configure scripts to fail during compilation.'; \ - echo ' Please provide a "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" file and restart the build.'; \ + echo ' Please provide a "$(INCLUDE_DIR)/site/$(ARCH)" file and restart the build.'; \ exit 1; \ fi @@ -91,20 +86,6 @@ prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE $(_SINGLE)$(SUBMAKE) -r package/index -# update all feeds, re-create index files, install symlinks -package/symlinks: - $(SCRIPT_DIR)/feeds update -a - $(SCRIPT_DIR)/feeds install -a - -# re-create index files, install symlinks -package/symlinks-install: - $(SCRIPT_DIR)/feeds update -i - $(SCRIPT_DIR)/feeds install -a - -# remove all symlinks, don't touch ./feeds -package/symlinks-clean: - $(SCRIPT_DIR)/feeds uninstall -a - .PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean endif