changeset 1296:9173328a786f

Fixed space handling in MakeHelper macros
author erikj
date Fri, 14 Nov 2014 17:01:45 +0100
parents 8c64a2af5f5e
children c43e61c85aee
files make/Main.gmk make/MakeHelpers.gmk
diffstat 2 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Fri Nov 14 16:55:23 2014 +0100
+++ b/make/Main.gmk	Fri Nov 14 17:01:45 2014 +0100
@@ -92,7 +92,7 @@
 
 ################################################################################
 # Gensrc targets, generating source before java compilation can be done
-$(eval $(call DeclareRecipesForPhase,GENSRC, \
+$(eval $(call DeclareRecipesForPhase, GENSRC, \
     TARGET_SUFFIX := gensrc, \
     FILE_PREFIX := Gensrc, \
     MAKE_SUBDIR := gensrc, \
@@ -107,7 +107,7 @@
 
 ################################################################################
 # Generate data targets
-$(eval $(call DeclareRecipesForPhase,GENDATA, \
+$(eval $(call DeclareRecipesForPhase, GENDATA, \
     TARGET_SUFFIX := gendata, \
     FILE_PREFIX := Gendata, \
     MAKE_SUBDIR := gendata, \
@@ -118,7 +118,7 @@
 
 ################################################################################
 # Copy files targets
-$(eval $(call DeclareRecipesForPhase,COPY, \
+$(eval $(call DeclareRecipesForPhase, COPY, \
     TARGET_SUFFIX := copy, \
     FILE_PREFIX := Copy, \
     MAKE_SUBDIR := copy, \
@@ -150,7 +150,7 @@
 
 ################################################################################
 # Targets for running rmic.
-$(eval $(call DeclareRecipesForPhase,RMIC, \
+$(eval $(call DeclareRecipesForPhase, RMIC, \
     TARGET_SUFFIX := rmic, \
     FILE_PREFIX := Rmic, \
     MAKE_SUBDIR := rmic, \
@@ -160,7 +160,7 @@
 
 ################################################################################
 # Targets for compiling native libraries
-$(eval $(call DeclareRecipesForPhase,LIBS, \
+$(eval $(call DeclareRecipesForPhase, LIBS, \
     TARGET_SUFFIX := libs, \
     FILE_PREFIX := Lib, \
     MAKE_SUBDIR := lib, \
@@ -171,7 +171,7 @@
 
 ################################################################################
 # Targets for compiling native executables
-$(eval $(call DeclareRecipesForPhase,LAUNCHER, \
+$(eval $(call DeclareRecipesForPhase, LAUNCHER, \
     TARGET_SUFFIX := launchers, \
     FILE_PREFIX := Launcher, \
     MAKE_SUBDIR := launcher, \
--- a/make/MakeHelpers.gmk	Fri Nov 14 16:55:23 2014 +0100
+++ b/make/MakeHelpers.gmk	Fri Nov 14 17:01:45 2014 +0100
@@ -304,14 +304,14 @@
 endef
 
 define Clean-gensrc
-	@$(PRINTF) "Cleaning gensrc $(if $1,for $(strip $1)) ..."
+	@$(PRINTF) "Cleaning gensrc $(if $1,for $(strip $1) )..."
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$(strip $1)
 	@$(PRINTF) " done\n"
 endef
 
 define Clean-java
-	@$(PRINTF) "Cleaning java $(if $1,for $(strip $1)) ..."
+	@$(PRINTF) "Cleaning java $(if $1,for $(strip $1) )..."
 	@$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
 	@$(PRINTF) " done\n"
 	@$(PRINTF) "Cleaning headers $(if $1,for $(strip $1)) ..."
@@ -320,7 +320,7 @@
 endef
 
 define Clean-native
-	@$(PRINTF) "Cleaning native $(if $1,for $(strip $1)) ..."
+	@$(PRINTF) "Cleaning native $(if $1,for $(strip $1) )..."
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs-stripped/$(strip $1)
@@ -330,7 +330,7 @@
 endef
 
 define Clean-include
-	@$(PRINTF) "Cleaning include $(if $1,for $(strip $1)) ..."
+	@$(PRINTF) "Cleaning include $(if $1,for $(strip $1) )..."
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
 	@$(PRINTF) " done\n"
 endef
@@ -420,14 +420,14 @@
 # $1_MODULES : All modules that had rules generated
 # $1_TARGETS : All targets generated
 define DeclareRecipesForPhase
-  $(foreach i,2 3 4 5 6 7, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(foreach i,2 3 4 5 6 7, $(if $($i),$(strip $1)_$(strip $($i)))$(NEWLINE))
   $(if $(8),$(error Internal makefile error: Too many arguments to \
       DeclareRecipesForPhase, please update MakeHelper.gmk))
 
-  $$(foreach m, $$($1_CHECK_MODULES), \
-      $$(eval $$(call DeclareRecipesForPhaseAndModule,$1,$$m)))
+  $$(foreach m, $$($(strip $1)_CHECK_MODULES), \
+      $$(eval $$(call DeclareRecipesForPhaseAndModule,$(strip $1),$$m)))
 
-  $1_TARGETS := $$($1)
+  $1_TARGETS := $$($(strip $1))
 endef
 
 ################################################################################