1.1 --- a/common/makefiles/RMICompilation.gmk Wed Oct 24 13:11:42 2012 -0700
1.2 +++ b/common/makefiles/RMICompilation.gmk Fri Oct 26 14:29:57 2012 -0700
1.3 @@ -34,16 +34,9 @@
1.4 # RUN_IIOP:=Set to run rmic with -iiop
1.5 # RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
1.6 # KEEP_GENERATED:=Set to keep generated sources around
1.7 - $(if $2,$1_$(strip $2))
1.8 - $(if $3,$1_$(strip $3))
1.9 - $(if $4,$1_$(strip $4))
1.10 - $(if $5,$1_$(strip $5))
1.11 - $(if $6,$1_$(strip $6))
1.12 - $(if $7,$1_$(strip $7))
1.13 - $(if $8,$1_$(strip $8))
1.14 - $(if $9,$1_$(strip $9))
1.15 - $(if $(10),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
1.16 -
1.17 + $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
1.18 + $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
1.19 + $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
1.20
1.21 $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/$1_rmic
1.22
1.23 @@ -86,12 +79,12 @@
1.24 $$($1_DEP_FILE): $$($1_CLASS_FILES)
1.25 $(MKDIR) -p $$($1_STUB_CLASSES_DIR)
1.26 if [ "x$$($1_ARGS)" != "x" ]; then \
1.27 - $(ECHO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) &&\
1.28 + $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) &&\
1.29 $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
1.30 -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
1.31 fi;
1.32 if [ "x$$($1_ARGS2)" != "x" ]; then \
1.33 - $(ECHO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) &&\
1.34 + $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) &&\
1.35 $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
1.36 -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
1.37 fi;
