diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-07-09 21:35:43 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-07-09 21:36:46 +0200 |
commit | 795308c52496f172ca1f354a49a9def48a2d1712 (patch) | |
tree | 50ccbe91a1ac1f591b93308d117d307160078f5b | |
parent | c9f15211a7fb93d3e78c7dc9ba4500aa1ca3b5cd (diff) | |
download | embtoolkit-795308c52496f172ca1f354a49a9def48a2d1712.tar.gz embtoolkit-795308c52496f172ca1f354a49a9def48a2d1712.tar.bz2 embtoolkit-795308c52496f172ca1f354a49a9def48a2d1712.tar.xz |
Host tools: move autoconf to htools/automake
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r-- | core/toolchain/toolchain.mk | 4 | ||||
-rw-r--r-- | packages/htools/automake/automake.kconfig (renamed from core/kconfig/automake.kconfig) | 12 | ||||
-rw-r--r-- | packages/htools/automake/automake.mk | 31 | ||||
-rw-r--r-- | packages/htools/automake/vars.mk (renamed from core/mk/automake.mk) | 13 | ||||
-rw-r--r-- | packages/htools/hosttools-buildopts.kconfig | 2 | ||||
-rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 |
6 files changed, 44 insertions, 21 deletions
diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index 828cae9..d7c24af 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -32,6 +32,7 @@ include packages/htools/ccache/vars.mk include packages/htools/m4/vars.mk include packages/htools/libtool/vars.mk include packages/htools/autoconf/vars.mk +include packages/htools/automake/vars.mk # GMP include core/mk/gmp.mk @@ -83,9 +84,8 @@ TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install # # Autotools # -include core/mk/automake.mk AUTOTOOLS_INSTALL := m4_host_install libtool_host_install -AUTOTOOLS_INSTALL += autoconf_host_install automake_install +AUTOTOOLS_INSTALL += autoconf_host_install automake_host_install # GNU sed include core/mk/gsed.mk diff --git a/core/kconfig/automake.kconfig b/packages/htools/automake/automake.kconfig index 6817f19..ba2ef10 100644 --- a/core/kconfig/automake.kconfig +++ b/packages/htools/automake/automake.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2011-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2010-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 @@ -23,17 +23,17 @@ # \date January 2011 ################################################################################ -config EMBTK_HAVE_AUTOMAKE +config EMBTK_HOST_HAVE_AUTOMAKE bool default y help - automake for autotools. + automake for autotools. -config EMBTK_AUTOMAKE_VERSION_STRING +config EMBTK_AUTOMAKE_HOST_VERSION_STRING string default "1.11.6" -config EMBTK_AUTOMAKE_NEED_PATCH +config EMBTK_AUTOMAKE_HOST_NEED_PATCH bool -config EMBTK_AUTOMAKE_NEED_AUTORECONF +config EMBTK_AUTOMAKE_HOS_NEED_AUTORECONF bool diff --git a/packages/htools/automake/automake.mk b/packages/htools/automake/automake.mk new file mode 100644 index 0000000..7367832 --- /dev/null +++ b/packages/htools/automake/automake.mk @@ -0,0 +1,31 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2010-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 automake.mk +# \brief automake.mk of Embtoolkit. +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# \date February 2010 +################################################################################ + +AUTOMAKE_HOST_NAME := automake +AUTOMAKE_HOST_VERSION := $(call embtk_get_pkgversion,automake_host) +AUTOMAKE_HOST_SITE := http://ftp.gnu.org/gnu/automake +AUTOMAKE_HOST_PACKAGE := automake-$(AUTOMAKE_HOST_VERSION).tar.xz +AUTOMAKE_HOST_SRC_DIR := $(embtk_toolsb)/automake-$(AUTOMAKE_HOST_VERSION) +AUTOMAKE_HOST_BUILD_DIR := $(embtk_toolsb)/automake-$(AUTOMAKE_HOST_VERSION) diff --git a/core/mk/automake.mk b/packages/htools/automake/vars.mk index 3d3f1a2..82285bc 100644 --- a/core/mk/automake.mk +++ b/packages/htools/automake/vars.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010-2011 Abdoulaye Walsimou GAYE. +# Copyright(C) 2010-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 @@ -23,18 +23,7 @@ # \date February 2010 ################################################################################ -AUTOMAKE_NAME := automake -AUTOMAKE_VERSION := $(call embtk_get_pkgversion,AUTOMAKE) -AUTOMAKE_SITE := http://ftp.gnu.org/gnu/automake -AUTOMAKE_PACKAGE := automake-$(AUTOMAKE_VERSION).tar.xz -AUTOMAKE_SRC_DIR := $(embtk_toolsb)/automake-$(AUTOMAKE_VERSION) -AUTOMAKE_BUILD_DIR := $(embtk_toolsb)/automake-$(AUTOMAKE_VERSION) - AUTOMAKE_DIR := $(embtk_htools)/usr ACLOCAL := $(AUTOMAKE_DIR)/bin/aclocal AUTOMAKE := $(AUTOMAKE_DIR)/bin/automake export ACLOCAL AUTOMAKE - -define embtk_install_automake - $(call __embtk_install_hostpkg,automake) -endef diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index 36aa44d..48a6fd8 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -105,7 +105,7 @@ source packages/htools/ccache/ccache.kconfig source packages/htools/m4/m4.kconfig source packages/htools/libtool/libtool.kconfig source packages/htools/autoconf/autoconf.kconfig -source core/kconfig/automake.kconfig +source packages/htools/automake/automake.kconfig # # GNU sed diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 0d640b1..b163a9a 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -28,6 +28,9 @@ embtk_pkgincdir := packages/htools # autoconf $(call embtk_include_hostpkg,autoconf_host) +# automake +$(call embtk_include_hostpkg,automake_host) + # cache $(call embtk_include_hostpkg,ccache_host) |