common/makefiles/IdlCompilation.gmk

changeset 494
e64f2cb57d05
parent 459
3156dff953b1
child 557
d2c1f80118de
     1.1 --- a/common/makefiles/IdlCompilation.gmk	Wed Oct 24 13:11:42 2012 -0700
     1.2 +++ b/common/makefiles/IdlCompilation.gmk	Fri Oct 26 14:29:57 2012 -0700
     1.3 @@ -59,7 +59,7 @@
     1.4  	$(MKDIR) -p $3/$$($4_TMPDIR)
     1.5  	$(RM) -rf $3/$$($4_TMPDIR)
     1.6  	$(MKDIR) -p $(dir $5)
     1.7 -	$(ECHO) Compiling IDL $(patsubst $2/%,%,$4) 
     1.8 +	$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4) 
     1.9  	$8 -td $3/$$($4_TMPDIR) \
    1.10  		-i $2/org/omg/CORBA \
    1.11  		-i $2/org/omg/PortableInterceptor \
    1.12 @@ -79,15 +79,9 @@
    1.13  # param 1 is for example BUILD_IDLS
    1.14  # param 2,3,4,5,6,7,8 are named args.
    1.15  #    IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
    1.16 -$(if $2,$1_$(strip $2))
    1.17 -$(if $3,$1_$(strip $3))
    1.18 -$(if $4,$1_$(strip $4))
    1.19 -$(if $5,$1_$(strip $5))
    1.20 -$(if $6,$1_$(strip $6))
    1.21 -$(if $7,$1_$(strip $7))
    1.22 -$(if $8,$1_$(strip $8))
    1.23 -$(if $9,$1_$(strip $9))
    1.24 -$(if $(10),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
    1.25 +$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
    1.26 +$(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
    1.27 +$(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
    1.28  
    1.29  # Remove any relative addressing in the paths.
    1.30  $1_SRC := $$(abspath $$($1_SRC))

mercurial