diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-05 21:07:52 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-05 21:07:52 +0100 |
| commit | 49bfbd776f8832a28ac8392e56e4b0ba9d53a004 (patch) | |
| tree | 2e619def7e65e62c7ad1370a4a8b82f61ccb5e4b | |
| parent | 59ac1e2a8367e7fcfda9974d66a8c5397397e1ba (diff) | |
| download | embtoolkit-49bfbd776f8832a28ac8392e56e4b0ba9d53a004.tar.gz embtoolkit-49bfbd776f8832a28ac8392e56e4b0ba9d53a004.tar.bz2 embtoolkit-49bfbd776f8832a28ac8392e56e4b0ba9d53a004.tar.xz | |
Build system: correct define MAKE variable and clash while building external packages
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.mk | 4 | ||||
| -rw-r--r-- | mk/macros.packages.mk | 11 | ||||
| -rw-r--r-- | mk/mkimage.mk | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 26d03d2..d9ee540 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -84,6 +84,6 @@ embtk_empty := embtk_space := $(embtk_empty) $(embtk_empty) embtk_comma := , - +# # Packages management macros -include $(EMBTK_ROOT)/mk/macros.packages.mk +include mk/macros.packages.mk diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index c5b4ff7..f623f32 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -62,6 +62,14 @@ define embtk_pkgconfig_getcflags $(PKGCONFIG_BIN) $(strip $(1)) --cflags) endef +# +# Define here which make program to use in MAKE. +# FIXME: On some systems, gnu make is named gmake (ie FreeBSD) +# +__embtk_make_cmd := make +__embtk_make_env := $(if $(V),MAKEFLAGS="",MAKEFLAGS="--no-print-directory --silent") +MAKE := $(__embtk_make_env) $(__embtk_make_cmd) + #Macro to adapt libtool files (*.la) for cross compiling __ltlibdirold = libdir='\/usr\/$(LIBDIR)\(.*\)' __ltlibdirnew = libdir='$(embtk_sysroot)\/usr\/$(LIBDIR)\1' @@ -166,8 +174,7 @@ ___embtk_pkg_kconfigsname = $(strip $(or $($(PKGV)_KCONFIGS_NAME),$(PKGV))) __embtk_pkg_kconfigsname = $(patsubst %_HOST,%,$(___embtk_pkg_kconfigsname)) __embtk_pkg_makedirs = $(strip $($(PKGV)_MAKE_DIRS)) -___embtk_pkg_makeenv = $(if $(V),MAKEFLAGS=,MAKEFLAGS="--no-print-directory --silent") -__embtk_pkg_makeenv = $(strip $($(PKGV)_MAKE_ENV)) $(___embtk_pkg_makeenv) +__embtk_pkg_makeenv = $(strip $($(PKGV)_MAKE_ENV)) __embtk_pkg_makeopts = $(strip $($(PKGV)_MAKE_OPTS)) # Some embtoolkit internal files for packages diff --git a/mk/mkimage.mk b/mk/mkimage.mk index fb5c921..983999c 100644 --- a/mk/mkimage.mk +++ b/mk/mkimage.mk @@ -37,9 +37,9 @@ mkimage_install: $(MAKEIMAGE_BUILD_DIR)/.installed: zlib_host_install $(Q)cp -R $(EMBTK_ROOT)/src/mkimage $(embtk_toolsb)/ - $(call __embtk_pkg_makeenv,makeimage) $(MAKE) -C $(MAKEIMAGE_BUILD_DIR) \ + $(Q)$(MAKE) -C $(MAKEIMAGE_BUILD_DIR) \ CPPFLAGS="-I$(embtk_htools)/usr/include" - $(call __embtk_pkg_makeenv,makeimage) $(MAKE) -C $(MAKEIMAGE_BUILD_DIR) \ + $(Q)$(MAKE) -C $(MAKEIMAGE_BUILD_DIR) \ DESTDIR=$(embtk_htools) install @touch $@ |