summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-07-11 21:06:07 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-07-11 21:06:20 +0200
commit210fa49162680f58d3a5d1c09c13b3a7866b54a3 (patch)
treea22c23d9ea9cfb2e6f8cda8dcdd709928cb497e4 /mk
parent8af1979102edbbe39a3c819fe38d41d4bf08c9ac (diff)
downloadembtoolkit-210fa49162680f58d3a5d1c09c13b3a7866b54a3.tar.gz
embtoolkit-210fa49162680f58d3a5d1c09c13b3a7866b54a3.tar.bz2
embtoolkit-210fa49162680f58d3a5d1c09c13b3a7866b54a3.tar.xz
Build system: build pkg-config among host tools earlier
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/packages.mk7
-rw-r--r--mk/rootfs.mk3
-rw-r--r--mk/toolchain.mk5
3 files changed, 7 insertions, 8 deletions
diff --git a/mk/packages.mk b/mk/packages.mk
index 8789052..981e26b 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -23,13 +23,14 @@
# \date May 2009
################################################################################
-ROOTFS_COMPONENTS-y :=
-HOSTTOOLS_COMPONENTS-y := mkimage_install
+ROOTFS_COMPONENTS-y :=
+HOSTTOOLS_COMPONENTS-y := mkimage_install pkgconfig_install
################################################################################
#################### Common include for target and host ########################
################################################################################
include $(EMBTK_ROOT)/mk/mkimage.mk
include $(EMBTK_ROOT)/mk/mtd-utils.mk
+include $(EMBTK_ROOT)/mk/pkgconfig.mk
################################################################################
######################### Packages for TARGET and HOST #########################
@@ -84,7 +85,7 @@ ROOTFS_COMPONENTS_CLEAN := $(subst install,clean,$(ROOTFS_COMPONENTS-))
host_packages_build:
ifeq ($(HOSTTOOLS_COMPONENTS-y),)
else
- $(call embtk_generic_message,"Building extra packages intended to run \
+ $(call embtk_generic_msg,"Building extra packages intended to run \
on your host machine ...")
@$(MAKE) $(HOSTTOOLS_COMPONENTS-y)
endif
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 1f7bebf..b7fcc5a 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -35,8 +35,7 @@ include $(EMBTK_ROOT)/mk/fs.mk
#host tools in order to build root filesystems: fakeroot and makedevs.
include $(EMBTK_ROOT)/mk/fakeroot.mk
include $(EMBTK_ROOT)/mk/makedevs.mk
-include $(EMBTK_ROOT)/mk/pkgconfig.mk
-ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_install pkgconfig_install
+ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_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 fd81e31..b48266d 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -93,7 +93,7 @@ TOOLCHAINBUILD := mkinitialpath ccache_install \
kernel-headers_install\
gmphost_install mpfrhost_install mpchost_install \
binutils_install gcc1_install eglibc-headers_install \
- gcc2_install eglibc_install gcc3_install pkgconfig_install
+ gcc2_install eglibc_install gcc3_install
else
#uClibc
include $(EMBTK_ROOT)/mk/uclibc.mk
@@ -101,8 +101,7 @@ TOOLCHAINBUILD := mkinitialpath ccache_install \
$(AUTOTOOLS_INSTALL) $(EMBTK_CMAKE_INSTALL) \
kernel-headers_install \
gmphost_install mpfrhost_install mpchost_install \
- binutils_install gcc1_install uclibc_install gcc3_install \
- pkgconfig_install
+ binutils_install gcc1_install uclibc_install gcc3_install
endif
#targets