Build system: move ccache under packages/htools/

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

6 files changed, 44 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 2bda3c9..c2b2d58 100644
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,7 @@ include mk/macros.mk
 include mk/targetsys.mk
 include mk/target-mcu.mk
 include mk/buildsystem.mk
+include packages/htools/hosttools-buildopts.mk
 include toolchain/toolchain.mk
 include mk/packages.mk
 include mk/rootfs/rootfs.mk
diff --git a/kconfig/ccache.kconfig b/packages/htools/ccache/ccache.kconfig
index c8dab4f..c8dab4f 100644
--- a/kconfig/ccache.kconfig
+++ b/packages/htools/ccache/ccache.kconfig
diff --git a/mk/ccache.mk b/packages/htools/ccache/ccache.mk
index 2c93f33..2c93f33 100644
--- a/mk/ccache.mk
+++ b/packages/htools/ccache/ccache.mk
diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig
index 0c15332..07c8b6a 100644
--- a/packages/htools/hosttools-buildopts.kconfig
+++ b/packages/htools/hosttools-buildopts.kconfig
@@ -102,7 +102,7 @@ source kconfig/mpc.kconfig
 #
 # ccache
 #
-source kconfig/ccache.kconfig
+source packages/htools/ccache/ccache.kconfig
 
 #
 # Autotools
diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk
new file mode 100644
index 0000000..916e5d7
--- /dev/null
+++ b/packages/htools/hosttools-buildopts.mk
@@ -0,0 +1,29 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         hosttools-buildopts.mk
+# \brief	packages needed for both toolchain and rootfs packages.
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         Marsh 2014
+################################################################################
+
+embtk_pkgincdir := packages/htools
+
+# cache
+$(call embtk_include_hostpkg,ccache)
diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk
index 63135ec..8dbefa3 100644
--- a/toolchain/toolchain.mk
+++ b/toolchain/toolchain.mk
@@ -29,9 +29,6 @@ embtk_pkgincdir := toolchain
 #
 include toolchain/vars.mk
 
-# ccache
-include mk/ccache.mk
-
 # GMP
 include mk/gmp.mk
 
@@ -51,27 +48,37 @@ include toolchain/binutils/binutils.mk
 #
 include toolchain/gcc/gcc.mk
 
+#
 # llvm/clang compiler infrastructure
+#
 include toolchain/llvm/clang/clang.mk
 include toolchain/llvm/llvm/llvm.mk
 include toolchain/llvm/compiler-rt/compiler-rt.mk
 include toolchain/libcxxrt/libcxxrt.mk
 include toolchain/llvm/libc++/libcxx.mk
 
+#
 # linux kernel headers
+#
 include mk/linux.mk
 
+#
 # toolchain addon: strace
+#
 include mk/strace.mk
 TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install
 
+#
 # toolchain addon: gdb
+#
 include packages/development/gdb/gdb.mk
-TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDB) += gdb_install
-TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
-TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install
+TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDB)	+= gdb_install
+TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDBSERVER)	+= gdbserver_install
+TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB)	+= gdb_host_install
 
+#
 # Autotools
+#
 include mk/libtool.mk
 include mk/autoconf.mk
 include mk/automake.mk