Explorar el Código

Makefile: globally define variables used at different places

$(comma) and $(space) are used in packages and the toolchain.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Peter Korsgaard hace 16 años
padre
commit
f85f2de174
Se han modificado 3 ficheros con 5 adiciones y 7 borrados
  1. 5 0
      Makefile
  2. 0 6
      package/directfb/directfb.mk
  3. 0 1
      toolchain/gcc/gcc-uclibc-3.x.mk

+ 5 - 0
Makefile

@@ -40,6 +40,11 @@ else
 BR2_LOCAL:=$(TOPDIR)/local
 endif
 
+# Variables for use in Make constructs
+comma:=,
+empty:=
+space:=$(empty) $(empty)
+
 # $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)

+ 0 - 6
package/directfb/directfb.mk

@@ -52,9 +52,6 @@ endif
 ifeq ($(DIRECTFB_GFX),)
 DIRECTFB_GFX:=none
 else
-comma:=,
-empty:=
-space:=$(empty) $(empty)
 DIRECTFB_GFX:=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif
 
@@ -75,9 +72,6 @@ endif
 ifeq ($(DIRECTFB_INPUT),)
 DIRECTFB_INPUT:=none
 else
-comma:=,
-empty:=
-space:=$(empty) $(empty)
 DIRECTFB_INPUT:=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif
 

+ 0 - 1
toolchain/gcc/gcc-uclibc-3.x.mk

@@ -233,7 +233,6 @@ gcc_initial-dirclean:
 # affect gcc-target. However, I haven't tested gcc-target yet so no
 # guarantees. mjn3
 
-comma:=,
 GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
 $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
 	mkdir -p $(GCC_BUILD_DIR2)