diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-05-27 16:03:55 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-05-27 16:03:55 +0200 |
| commit | d77a89ed5facb2be70cf44fa6443bf3057a54561 (patch) | |
| tree | 405d8cc1bbffb69399173200dc2f3f9e4f385d79 /mk | |
| parent | 20b401a5770e6cb1da538b2af7ae16145bc167eb (diff) | |
| download | embtoolkit-d77a89ed5facb2be70cf44fa6443bf3057a54561.tar.gz embtoolkit-d77a89ed5facb2be70cf44fa6443bf3057a54561.tar.bz2 embtoolkit-d77a89ed5facb2be70cf44fa6443bf3057a54561.tar.xz | |
Internal macros: make embtk_{space,comma,empty} globally available
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/gcc.mk | 2 | ||||
| -rw-r--r-- | mk/macros.mk | 6 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -44,7 +44,7 @@ __GCC_LANGUAGES += $(if $(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVEC),objc) __GCC_LANGUAGES += $(if $(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVECPP),obj-c++) __GCC_LANGUAGES += $(if $(CONFIG_EMBTK_GCC_LANGUAGE_FORTRAN),fortran) __GCC_LANGUAGES += $(if $(CONFIG_EMBTK_GCC_LANGUAGE_ADA),ada) -GCC_LANGUAGES := $(subst $(__embtk_space),$(__embtk_comma),$(strip $(__GCC_LANGUAGES))) +GCC_LANGUAGES := $(subst $(embtk_space),$(embtk_comma),$(strip $(__GCC_LANGUAGES))) # diff --git a/mk/macros.mk b/mk/macros.mk index 00e85a1..349396f 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -80,9 +80,9 @@ embtk_perror = $(call embtk_echo_red,"$(__embtk_msg_h)\\n~~ EmbToolkit ~~ ERROR: embtk_pinfo = $(call embtk_echo_blue,"$(__embtk_msg_h)\n~~ EmbToolkit ~~ $(1)\n$(__embtk_msg_h)") # Macros for emmpty, space and comma -__embtk_empty := -__embtk_space := $(__embtk_empty) $(__embtk_empty) -__embtk_comma := , +embtk_empty := +embtk_space := $(embtk_empty) $(embtk_empty) +embtk_comma := , # Packages management macros diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index 060a53b..c211922 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -34,7 +34,7 @@ PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config __EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig __EMBTK_PKG_CONFIG_PATH += $(SYSROOT)/usr/share/pkgconfig -EMBTK_PKG_CONFIG_PATH := $(subst $(__embtk_space),:,$(__EMBTK_PKG_CONFIG_PATH)) +EMBTK_PKG_CONFIG_PATH := $(subst $(embtk_space),:,$(__EMBTK_PKG_CONFIG_PATH)) EMBTK_PKG_CONFIG_LIBDIR := $(EMBTK_PKG_CONFIG_PATH) __EMBTK_HOST_PKG_CONFIG_PATH := $(HOSTTOOLS)/usr/lib/pkgconfig/ @@ -42,7 +42,7 @@ __EMBTK_HOST_PKG_CONFIG_PATH += /usr/lib/pkgconfig/ /usr/share/pkgconfig/ __EMBTK_HOST_PKG_CONFIG_PATH += /usr/local/lib/pkgconfig/ /usr/local/share/pkgconfig/ __EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/lib -type f -name '*.pc')) __EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/local/lib -type f -name '*.pc')) -EMBTK_HOST_PKG_CONFIG_PATH := $(subst $(__embtk_space),:,$(sort $(__EMBTK_HOST_PKG_CONFIG_PATH))) +EMBTK_HOST_PKG_CONFIG_PATH := $(subst $(embtk_space),:,$(sort $(__EMBTK_HOST_PKG_CONFIG_PATH))) PKGCONFIG_CONFIGURE_OPTS := --with-pc-path="$(EMBTK_HOST_PKG_CONFIG_PATH)" |