Host tools: move m4 to htools/m4

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

6 files changed, 44 insertions, 22 deletions

diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk
index 79b9728..cde6306 100644
--- a/core/toolchain/toolchain.mk
+++ b/core/toolchain/toolchain.mk
@@ -29,6 +29,7 @@ embtk_pkgincdir := toolchain
 #
 include core/toolchain/vars.mk
 include packages/htools/ccache/vars.mk
+include packages/htools/m4/vars.mk
 
 # GMP
 include core/mk/gmp.mk
@@ -83,8 +84,7 @@ TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB)	+= gdb_host_install
 include core/mk/libtool.mk
 include core/mk/autoconf.mk
 include core/mk/automake.mk
-include core/mk/m4.mk
-AUTOTOOLS_INSTALL	:= m4_install libtool_install autoconf_install
+AUTOTOOLS_INSTALL	:= m4_host_install libtool_install autoconf_install
 AUTOTOOLS_INSTALL	+= automake_install
 
 # GNU sed
diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig
index 5dac98a..4541439 100644
--- a/packages/htools/hosttools-buildopts.kconfig
+++ b/packages/htools/hosttools-buildopts.kconfig
@@ -102,7 +102,7 @@ source packages/htools/ccache/ccache.kconfig
 #
 # Autotools
 #
-source core/kconfig/m4.kconfig
+source packages/htools/m4/m4.kconfig
 source core/kconfig/libtool.kconfig
 source core/kconfig/autoconf.kconfig
 source core/kconfig/automake.kconfig
diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk
index cb66b4c..c7be0ad 100644
--- a/packages/htools/hosttools-buildopts.mk
+++ b/packages/htools/hosttools-buildopts.mk
@@ -35,6 +35,9 @@ $(call embtk_include_hostpkg,fakeroot_host)
 # mtd-utils
 $(call embtk_include_hostpkg,mtdutils_host)
 
+# m4
+$(call embtk_include_hostpkg,m4_host)
+
 # pkgconf
 include packages/htools/pkgconf/vars.mk
 $(call embtk_include_hostpkg,pkgconf_host)
diff --git a/core/kconfig/m4.kconfig b/packages/htools/m4/m4.kconfig
index 45defd0..1a9a5c9 100644
--- a/core/kconfig/m4.kconfig
+++ b/packages/htools/m4/m4.kconfig
@@ -23,18 +23,18 @@
 # \date         January 2011
 ################################################################################
 
-config EMBTK_HAVE_M4
+config EMBTK_HOST_HAVE_M4
 	bool
 	default y
-	select EMBTK_M4_NEED_PATCH
+	select EMBTK_M4_HOST_NEED_PATCH
 	help
 	 m4 for autotools.
 
-config EMBTK_M4_VERSION_STRING
+config EMBTK_M4_HOST_VERSION_STRING
 	string
 	default "1.4.17"
 
-config EMBTK_M4_NEED_PATCH
+config EMBTK_M4_HOST_NEED_PATCH
 	bool
-config EMBTK_M4_NEED_AUTORECONF
+config EMBTK_M4_HOST_NEED_AUTORECONF
 	bool
diff --git a/packages/htools/m4/m4.mk b/packages/htools/m4/m4.mk
new file mode 100644
index 0000000..e09b31e
--- /dev/null
+++ b/packages/htools/m4/m4.mk
@@ -0,0 +1,31 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2010-2013 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         m4.mk
+# \brief	m4.mk of Embtoolkit.
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         February 2010
+################################################################################
+
+M4_HOST_NAME		:= m4
+M4_HOST_VERSION		:= $(call embtk_get_pkgversion,m4_host)
+M4_HOST_SITE		:= http://ftp.gnu.org/gnu/m4
+M4_HOST_PACKAGE		:= m4-$(M4_HOST_VERSION).tar.bz2
+M4_HOST_SRC_DIR		:= $(embtk_toolsb)/m4-$(M4_HOST_VERSION)
+M4_HOST_BUILD_DIR	:= $(embtk_toolsb)/m4-$(M4_HOST_VERSION)
diff --git a/core/mk/m4.mk b/packages/htools/m4/vars.mk
index 890b269..564e30c 100644
--- a/core/mk/m4.mk
+++ b/packages/htools/m4/vars.mk
@@ -17,26 +17,14 @@
 #
 ################################################################################
 #
-# \file         m4.mk
-# \brief	m4.mk of Embtoolkit.
+# \file         vars.mk
+# \brief	vars.mk of Embtoolkit.
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         February 2010
 ################################################################################
 
-M4_NAME		:= m4
-M4_VERSION	:= $(call embtk_get_pkgversion,m4)
-M4_SITE		:= http://ftp.gnu.org/gnu/m4
-M4_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-M4_PACKAGE	:= m4-$(M4_VERSION).tar.bz2
-M4_SRC_DIR	:= $(embtk_toolsb)/m4-$(M4_VERSION)
-M4_BUILD_DIR	:= $(embtk_toolsb)/m4-$(M4_VERSION)
-
 # m4 binaries
 M4_DIR	:= $(embtk_htools)/usr
 M4_BIN	:= $(M4_DIR)/bin/m4
 M4	:= $(M4_BIN)
 export M4
-
-define embtk_install_m4
-	$(call __embtk_install_hostpkg,m4)
-endef