From 5d0b1de6b5ee193376ddd09fffc19f7c1c9b98b9 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 21 Feb 2010 01:55:55 +0100 Subject: Build autotools earlier --- mk/autoconf.mk | 3 ++- mk/rootfs.mk | 6 +----- mk/toolchain.mk | 12 ++++++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mk/autoconf.mk b/mk/autoconf.mk index c6ebde2..d440e91 100644 --- a/mk/autoconf.mk +++ b/mk/autoconf.mk @@ -30,12 +30,13 @@ AUTOCONF_DIR := $(HOSTTOOLS)/usr/local/autoconf AUTOCONF := $(AUTOCONF_DIR)/bin/autoconf AUTOHEADER := $(AUTOCONF_DIR)/bin/autoheader +AUTOM4TE := $(AUTOCONF_DIR)/bin/autom4te AUTORECONF := $(AUTOCONF_DIR)/bin/autoreconf AUTOSCAN := $(AUTOCONF_DIR)/bin/autoscan AUTOUPDATE := $(AUTOCONF_DIR)/bin/autoupdate IFNAMES := $(AUTOCONF_DIR)/bin/ifnames -export AUTOCONF AUTOHEADER AUTORECONF AUTOSCAN AUTOUPDATE IFNAMES +export AUTOCONF AUTOHEADER AUTOM4TE AUTORECONF AUTOSCAN AUTOUPDATE IFNAMES autoconf_install: $(AUTOCONF_BUILD_DIR)/.installed diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 76f7acf..5fb2e76 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -32,14 +32,10 @@ FILESYSTEMS-y := include $(EMBTK_ROOT)/mk/fs.mk #host tools in order to build root filesystems: fakeroot and makedevs. -include $(EMBTK_ROOT)/mk/autoconf.mk -include $(EMBTK_ROOT)/mk/automake.mk include $(EMBTK_ROOT)/mk/fakeroot.mk -include $(EMBTK_ROOT)/mk/m4.mk include $(EMBTK_ROOT)/mk/makedevs.mk include $(EMBTK_ROOT)/mk/pkgconfig.mk -ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_install pkgconfig_install \ - m4_install autoconf_install automake_install +ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_install pkgconfig_install #Does CPIO archive for initramfs selected? FILESYSTEMS-$(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO) += build_initramfs_archive diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 758cbed..b15f9c1 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -58,17 +58,25 @@ include $(EMBTK_ROOT)/mk/gcc.mk #linux kernel headers include $(EMBTK_ROOT)/mk/kernel-headers.mk +#Autotools +include $(EMBTK_ROOT)/mk/autoconf.mk +include $(EMBTK_ROOT)/mk/automake.mk +include $(EMBTK_ROOT)/mk/m4.mk + + ifeq ($(CONFIG_EMBTK_CLIB_EGLIBC),y) #EGLIBC include $(EMBTK_ROOT)/mk/eglibc.mk -TOOLCHAINBUILD := mkinitialpath kernel-headers_install ccachehost_install \ +TOOLCHAINBUILD := mkinitialpath m4_install autoconf_install automake_install \ + kernel-headers_install ccachehost_install \ gmphost_install mpfrhost_install mpchost_install \ binutils_install gcc1_install eglibc-headers_install \ gcc2_install eglibc_install gcc3_install else #uClibc include $(EMBTK_ROOT)/mk/uclibc.mk -TOOLCHAINBUILD := mkinitialpath kernel-headers_install ccachehost_install \ +TOOLCHAINBUILD := mkinitialpath m4_install autoconf_install automake_install \ + kernel-headers_install ccachehost_install \ gmphost_install mpfrhost_install mpchost_install \ binutils_install gcc1_install uclibc_install gcc3_install endif -- cgit v1.2.3