fix a typo

[openwrt/svn-archive/archive.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 4bc7dfab48e538aaf511e6051f85b567212fb71d..8883cbe5dce79bff152ebf3f8a937783860fc054 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -5,13 +5,16 @@
 # See /LICENSE for more information.
 #
 
--include $(TOPDIR)/.config
+ifeq ($(DUMP),)
+  -include $(TOPDIR)/.config
+endif
 include $(TOPDIR)/include/verbose.mk
 
 export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
 
 ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
 TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))
+BUILD_DIR_SUFFIX:=$(strip $(subst ",, $(CONFIG_BUILD_SUFFIX)))
 WGET:=$(strip $(subst ",, $(CONFIG_WGET)))
 #"))"))")) # fix vim's broken syntax highlighting
 
@@ -28,7 +31,7 @@ STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH)
 BIN_DIR:=$(TOPDIR)/bin
 PACKAGE_DIR:=$(BIN_DIR)/packages
 IPKG_TARGET_DIR:=$(PACKAGE_DIR)
-BUILD_DIR:=$(TOPDIR)/build_$(ARCH)
+BUILD_DIR:=$(TOPDIR)/build_$(ARCH)$(BUILD_DIR_SUFFIX)
 TMP_DIR:=$(TOPDIR)/tmp
 STAMP_DIR:=$(BUILD_DIR)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root
@@ -84,7 +87,8 @@ TARGET_CONFIGURE_OPTS:= \
   RANLIB=$(TARGET_CROSS)ranlib \
   STRIP=$(TARGET_CROSS)strip \
   OBJCOPY=$(TARGET_CROSS)objcopy \
-       OBJDUMP=$(TARGET_CROSS)objdump
+       OBJDUMP=$(TARGET_CROSS)objdump \
+       SIZE=$(TARGET_CROSS)size
 
 # strip an entire directory
 RSTRIP:= \
@@ -131,20 +135,6 @@ $(call shvar,$(1))=$$(call $(1))
 export $(call shvar,$(1))
 endef
 
-# Default targets for subdirectory calls
-# Parameters:
-#      1: dependencies for the prepare step
-define default_subtargets
-  %-download %-prepare %-compile %-install %-clean: FORCE
-       $$(MAKE) -C $$* $$(patsubst $$*-%,%,$$@)
-
-  %-compile: %-prepare 
-  %-install: %-compile
-  .SILENT: %-clean
-endef
-
-
 all:
 FORCE: ;
 .PHONY: FORCE
-%: ;