diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/kconfig/automake.kconfig | 39 | ||||
| -rw-r--r-- | core/mk/automake.mk | 40 | ||||
| -rw-r--r-- | core/toolchain/toolchain.mk | 4 |
3 files changed, 2 insertions, 81 deletions
diff --git a/core/kconfig/automake.kconfig b/core/kconfig/automake.kconfig deleted file mode 100644 index 6817f19..0000000 --- a/core/kconfig/automake.kconfig +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# Embtoolkit -# Copyright(C) 2011-2012 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.kconfig -# \brief automake.kconfig of Embtoolkit. -# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> -# \date January 2011 -################################################################################ - -config EMBTK_HAVE_AUTOMAKE - bool - default y - help - automake for autotools. - -config EMBTK_AUTOMAKE_VERSION_STRING - string - default "1.11.6" - -config EMBTK_AUTOMAKE_NEED_PATCH - bool -config EMBTK_AUTOMAKE_NEED_AUTORECONF - bool diff --git a/core/mk/automake.mk b/core/mk/automake.mk deleted file mode 100644 index 3d3f1a2..0000000 --- a/core/mk/automake.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# Embtoolkit -# Copyright(C) 2010-2011 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_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/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 |