move common variables to a dedicated include file

SVN-Revision: 14648

diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
new file mode 100644 (file)
index 0000000..b9a9431
--- /dev/null
+++ b/include/toolchain-build.mk
@@ -0,0 +1,13 @@
+# 
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+override CONFIG_AUTOREBUILD=
+
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+
+include $(INCLUDE_DIR)/host-build.mk

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index b0b65f381baa08a560cd2a59eeafb543e1102803..10902df5c47b9242a3d3373803df11f3dcd15581 100644 (file)
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -28,12 +28,8 @@ endif
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
 REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 BINUTILS_CONFIGURE:= \
        ./configure \

diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 4eabbbfe6c6dd5d5d61d4ddafdcf3271b8cf6749..ac652707792ef8c45aabb30e98f86ea730624f0d 100644 (file)
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -33,13 +33,9 @@ endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR)
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
 
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built
 STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 10dab856fdf961b139694f935e5aa31cb8c19541..e2e8d286430342d46f7a3cd6d4ec5f0734ee4710 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -47,12 +47,7 @@ endif
 
 PATCH_DIR=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed
 

diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 4911faef1c844b5c9ef90c6e9c2d0888c55ffd7f..c09414dcd67a93e23cd0732e396ec8544bf77b2e 100644 (file)
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -14,10 +14,8 @@ PKG_MD5SUM:=05b928f41fa5b482e49ca2c24762a0ae
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gdb
 PKG_CAT:=bzcat
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 define Host/Configure
        (cd $(HOST_BUILD_DIR); \

diff --git a/toolchain/glibc-ports/Makefile b/toolchain/glibc-ports/Makefile
index a60b71f4311e84506dae78ae8326f8f025ed72d5..836ca3466de21a4cd22ecb6fc1351fc9b78f5183 100644 (file)
--- a/toolchain/glibc-ports/Makefile
+++ b/toolchain/glibc-ports/Makefile
@@ -24,12 +24,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc-ports_built
 STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc-ports_installed

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 73dbdd8fe5401bd591c6de5ad2b63031d9f36057..bfef152c80ea64191387c24f3be10a7bba9e96cd 100644 (file)
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -24,12 +24,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built
 STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 5fdfee9a6a062ed0e694ea18a4b437b29e718544..04945146fc60238b898d274c87e4a5cf6474a42c 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -9,12 +9,8 @@ include $(TOPDIR)/rules.mk
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
 override QUILT:=
 override HOST_QUILT:=
-override CONFIG_AUTOREBUILD=
 
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -26,7 +22,7 @@ HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)
 
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index ce9acad4479b724e1d0d32e433c157dc880a5fca..61dcaaaff5ef561817b61a31fd132535a2cb94bd 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -51,17 +51,13 @@ ifeq ($(PKG_VERSION_SNAPSHOT),y)
   PKG_MD5SUM:=
 endif
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 ifeq ($(PKG_VERSION_SNAPSHOT),y)
-  HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_EXTRAVERSION)
+  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION)
 else
-  HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
+  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)
 endif
 
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
 STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
 STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed