make/common/RMICompilation.gmk

*** 35,53 ****
  #   RUN_V11:=Set to run rmic with -v1.1
  #   RUN_V12:=Set to run rmic with -v1.2
  #   RUN_IIOP:=Set to run rmic with -iiop
  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
  #   KEEP_GENERATED:=Set to keep generated sources around
! define SetupRMICompilation
!   $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
!   $(call EvalDebugWrapper,$(strip $1),$(call SetupRMICompilationInner,$(strip $1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)))
! endef
! 
! define SetupRMICompilationInner
!   $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $(strip $($i)),$1_$(strip $($i)))$(NEWLINE))
!   $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
!   $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
  
    $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
  
    $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
    $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
--- 35,46 ----
  #   RUN_V11:=Set to run rmic with -v1.1
  #   RUN_V12:=Set to run rmic with -v1.2
  #   RUN_IIOP:=Set to run rmic with -iiop
  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
  #   KEEP_GENERATED:=Set to keep generated sources around
! SetupRMICompilation = $(NamedParamsMacroTemplate)
! define SetupRMICompilationBody
  
    $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
  
    $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
    $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))