diff options
| -rw-r--r-- | core/toolchain/toolchain.mk | 6 | ||||
| -rw-r--r-- | packages/htools/autoconf/autoconf.kconfig (renamed from core/kconfig/autoconf.kconfig) | 6 | ||||
| -rw-r--r-- | packages/htools/autoconf/autoconf.mk | 31 | ||||
| -rw-r--r-- | packages/htools/autoconf/vars.mk (renamed from core/mk/autoconf.mk) | 14 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.kconfig | 2 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 |
6 files changed, 43 insertions, 19 deletions
diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index 265617f..828cae9 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -31,6 +31,7 @@ include core/toolchain/vars.mk include packages/htools/ccache/vars.mk include packages/htools/m4/vars.mk include packages/htools/libtool/vars.mk +include packages/htools/autoconf/vars.mk # GMP include core/mk/gmp.mk @@ -82,10 +83,9 @@ TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install # # Autotools # -include core/mk/autoconf.mk include core/mk/automake.mk -AUTOTOOLS_INSTALL := m4_host_install libtool_host_install autoconf_install -AUTOTOOLS_INSTALL += automake_install +AUTOTOOLS_INSTALL := m4_host_install libtool_host_install +AUTOTOOLS_INSTALL += autoconf_host_install automake_install # GNU sed include core/mk/gsed.mk diff --git a/core/kconfig/autoconf.kconfig b/packages/htools/autoconf/autoconf.kconfig index eeab3d5..a92d615 100644 --- a/core/kconfig/autoconf.kconfig +++ b/packages/htools/autoconf/autoconf.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2013 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 @@ -27,12 +27,12 @@ # # Default autoconf version # -config EMBTK_HAVE_AUTOCONF +config EMBTK_HOST_HAVE_AUTOCONF bool default y help autoconf for autotools. -config EMBTK_AUTOCONF_VERSION_STRING +config EMBTK_AUTOCONF_HOST_VERSION_STRING string default "2.68" diff --git a/packages/htools/autoconf/autoconf.mk b/packages/htools/autoconf/autoconf.mk new file mode 100644 index 0000000..74b8137 --- /dev/null +++ b/packages/htools/autoconf/autoconf.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 autoconf.mk +# \brief autoconf.mk of Embtoolkit. +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# \date February 2010 +################################################################################ + +AUTOCONF_HOST_NAME := autoconf +AUTOCONF_HOST_VERSION := $(call embtk_get_pkgversion,autoconf_host) +AUTOCONF_HOST_SITE := http://ftp.gnu.org/gnu/autoconf +AUTOCONF_HOST_PACKAGE := autoconf-$(AUTOCONF_HOST_VERSION).tar.bz2 +AUTOCONF_HOST_SRC_DIR := $(embtk_toolsb)/autoconf-$(AUTOCONF_HOST_VERSION) +AUTOCONF_HOST_BUILD_DIR := $(embtk_toolsb)/autoconf-$(AUTOCONF_HOST_VERSION) diff --git a/core/mk/autoconf.mk b/packages/htools/autoconf/vars.mk index d4bd6c7..765f946 100644 --- a/core/mk/autoconf.mk +++ b/packages/htools/autoconf/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,13 +23,6 @@ # \date February 2010 ################################################################################ -AUTOCONF_NAME := autoconf -AUTOCONF_VERSION := $(call embtk_get_pkgversion,autoconf) -AUTOCONF_SITE := http://ftp.gnu.org/gnu/autoconf -AUTOCONF_PACKAGE := autoconf-$(AUTOCONF_VERSION).tar.bz2 -AUTOCONF_SRC_DIR := $(embtk_toolsb)/autoconf-$(AUTOCONF_VERSION) -AUTOCONF_BUILD_DIR := $(embtk_toolsb)/autoconf-$(AUTOCONF_VERSION) - # autoconf binaries AUTOCONF_DIR := $(embtk_htools)/usr AUTOCONF := $(AUTOCONF_DIR)/bin/autoconf @@ -39,8 +32,5 @@ AUTORECONF := $(AUTOCONF_DIR)/bin/autoreconf AUTOSCAN := $(AUTOCONF_DIR)/bin/autoscan AUTOUPDATE := $(AUTOCONF_DIR)/bin/autoupdate IFNAMES := $(AUTOCONF_DIR)/bin/ifnames -export AUTOCONF AUTOHEADER AUTOM4TE AUTORECONF AUTOSCAN AUTOUPDATE IFNAMES -define embtk_install_autoconf - $(call __embtk_install_hostpkg,autoconf) -endef +export AUTOCONF AUTOHEADER AUTOM4TE AUTORECONF AUTOSCAN AUTOUPDATE IFNAMES diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index 1abbf89..36aa44d 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -104,7 +104,7 @@ source packages/htools/ccache/ccache.kconfig # source packages/htools/m4/m4.kconfig source packages/htools/libtool/libtool.kconfig -source core/kconfig/autoconf.kconfig +source packages/htools/autoconf/autoconf.kconfig source core/kconfig/automake.kconfig # diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 5436f6e..0d640b1 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -25,6 +25,9 @@ embtk_pkgincdir := packages/htools +# autoconf +$(call embtk_include_hostpkg,autoconf_host) + # cache $(call embtk_include_hostpkg,ccache_host) |