X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=rules.mk;h=e76c75d04b7dc3677f20172a7af931dd7ca8b355;hp=be269e77f33c9b308bc5bd01c255411e99ab21d0;hb=bb709da2e1f80fb50f215b52e596052911936d3d;hpb=39ed9eab85c390e575242b9d170f290272b6f582

diff --git a/rules.mk b/rules.mk
index be269e77f3..e76c75d04b 100644
--- a/rules.mk
+++ b/rules.mk
@@ -5,66 +5,85 @@
 # See /LICENSE for more information.
 #
 
--include $(TOPDIR)/.config
+ifeq ($(DUMP),)
+  -include $(TOPDIR)/.config
+endif
 include $(TOPDIR)/include/verbose.mk
 
+TMP_DIR:=$(TOPDIR)/tmp
+
+include $(TOPDIR)/include/target.mk
+
 export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
-export BASH=$(shell which bash)
 
-ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
-TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))
-WGET:=$(strip $(subst ",, $(CONFIG_WGET)))
-#"))"))")) # fix vim's broken syntax highlighting
+define qstrip
+$(strip $(subst ",,$(1)))
+endef
+#"))
 
-OPTIMIZE_FOR_CPU:=$(ARCH)
+ARCH:=$(call qstrip,$(CONFIG_ARCH))
+TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))
+BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX))
+GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION))
 
-# DIRECTORIES #
+OPTIMIZE_FOR_CPU:=$(ARCH)
 
 DL_DIR:=$(TOPDIR)/dl
+BIN_DIR:=$(TOPDIR)/bin
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts
-TOOL_BUILD_DIR:=$(TOPDIR)/tool_build
-TOOLCHAIN_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
-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)
-TMP_DIR:=$(BUILD_DIR)/tmp
+BUILD_DIR_BASE:=$(TOPDIR)/build_dir
+BUILD_DIR:=$(BUILD_DIR_BASE)/$(ARCH)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+BUILD_DIR_HOST:=$(BUILD_DIR_BASE)/host
+BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)
+STAGING_DIR:=$(TOPDIR)/staging_dir/$(ARCH)
+STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
+TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc$(GCCV)
+PACKAGE_DIR:=$(BIN_DIR)/packages/$(TARGET)
 STAMP_DIR:=$(BUILD_DIR)/stamp
-TARGET_DIR:=$(BUILD_DIR)/root
+STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
+TARGET_DIR:=$(BUILD_DIR)/root-$(BOARD)
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
 
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  -include $(TOOLCHAIN_DIR)/info.mk
   REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
   GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-  TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+  TARGET_CROSS?=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 endif
 
-IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
-
-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
-TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
+TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH)
+TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) -fhonour-copts
 
 export PATH:=$(TARGET_PATH)
 
-LINUX_DIR:=$(BUILD_DIR)/linux
-LINUX_HEADERS_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux
+LINUX_HEADERS_DIR:=$(BUILD_DIR_TOOLCHAIN)/linux
 
-# APPLICATIONS #
 HOSTCC:=gcc
+HOST_CFLAGS:=-O2 -I$(STAGING_DIR_HOST)/include
+HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib
+
 TARGET_CC:=$(TARGET_CROSS)gcc
-STRIP:=$(STAGING_DIR)/bin/sstrip
+STRIP:=$(STAGING_DIR_HOST)/bin/sstrip
 PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
-SED:=$(STAGING_DIR)/bin/sed -i -e
+SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
 CP:=cp -fpR
 
+INSTALL_BIN:=install -m0755
+INSTALL_DIR:=install -d -m0755
+INSTALL_DATA:=install -m0644
+INSTALL_CONF:=install -m0600
+
 ifneq ($(CONFIG_CCACHE),)
   # FIXME: move this variable to a better location
   export CCACHE_DIR=$(STAGING_DIR)/ccache
   TARGET_CC:= ccache $(TARGET_CC)
 endif
 
+EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS := $(EXTRA_CPPFLAGS)
+EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+
 TARGET_CONFIGURE_OPTS:= \
   AR=$(TARGET_CROSS)ar \
   AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
@@ -74,21 +93,25 @@ TARGET_CONFIGURE_OPTS:= \
   GCC="$(TARGET_CC)" \
   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \
-  STRIP=$(TARGET_CROSS)strip
+  STRIP=$(TARGET_CROSS)strip \
+  OBJCOPY=$(TARGET_CROSS)objcopy \
+	OBJDUMP=$(TARGET_CROSS)objdump \
+	SIZE=$(TARGET_CROSS)size
 
 # strip an entire directory
 RSTRIP:= \
+  NM="$(TARGET_CROSS)nm" \
   STRIP="$(STRIP)" \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
   $(SCRIPT_DIR)/rstrip.sh
 
 # where to build (and put) .ipk packages
 IPKG:= \
-  PATH="$(STAGING_DIR)/bin:$(PATH)" \
-  IPKG_TMP=$(BUILD_DIR)/tmp \
+  PATH="$(STAGING_DIR_HOST)/bin:$(PATH)" \
+  IPKG_TMP=$(TMP_DIR)/ipkg \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \
-  IPKG_OFFLINE_ROOT=$(BUILD_DIR)/root \
+  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
   $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
 
 # invoke ipkg-build with some default options
@@ -106,12 +129,20 @@ ifneq ($(CONFIG_LARGEFILE),y)
 endif
 
 ifeq ($(CONFIG_TAR_VERBOSITY),y)
-  TAR_OPTIONS=-xvf
+  TAR_OPTIONS:=-xvf -
 else
-  TAR_OPTIONS=-xf
+  TAR_OPTIONS:=-xf -
 endif
 
+define shvar
+V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+endef
+
+define shexport
+$(call shvar,$(1))=$$(call $(1))
+export $(call shvar,$(1))
+endef
+
 all:
 FORCE: ;
 .PHONY: FORCE
-%: ;