common/makefiles/IdlCompilation.gmk

*** 54,80 ****
      ifneq ($$(filter $7,$4),)
          $4_OLDIMPLBASE:=-oldImplBase
          $4_OLDIMPLBASE_MSG:=with -oldImplBase
      endif
      $5 : $4
!         mkdir -p $3/$$($4_TMPDIR)
!         rm -rf $3/$$($4_TMPDIR)
!         mkdir -p $(dir $5)
!         echo Compiling IDL $(patsubst $2/%,%,$4) 
          $8 -td $3/$$($4_TMPDIR) \
                  -i $2/org/omg/CORBA \
                  -i $2/org/omg/PortableInterceptor \
                  -i $2/org/omg/PortableServer \
                  -D CORBA3 -corba 3.0 \
                  -fall \
                  $$($4_OLDIMPLBASE) \
                  $(PREFIXES) \
                  $4
!         rm -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
!         cp -rp $3/$$($4_TMPDIR)/* $3
!         (cd $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5)
!         rm -rf $3/$$($4_TMPDIR)
  endef
  
  define SetupIdlCompilation
  # param 1 is for example BUILD_IDLS
  # param 2,3,4,5,6,7,8 are named args.
--- 54,80 ----
      ifneq ($$(filter $7,$4),)
          $4_OLDIMPLBASE:=-oldImplBase
          $4_OLDIMPLBASE_MSG:=with -oldImplBase
      endif
      $5 : $4
!         $(MKDIR) -p $3/$$($4_TMPDIR)
!         $(RM) -rf $3/$$($4_TMPDIR)
!         $(MKDIR) -p $(dir $5)
!         $(ECHO) Compiling IDL $(patsubst $2/%,%,$4) 
          $8 -td $3/$$($4_TMPDIR) \
                  -i $2/org/omg/CORBA \
                  -i $2/org/omg/PortableInterceptor \
                  -i $2/org/omg/PortableServer \
                  -D CORBA3 -corba 3.0 \
                  -fall \
                  $$($4_OLDIMPLBASE) \
                  $(PREFIXES) \
                  $4
!         $(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
!         $(CP) -rp $3/$$($4_TMPDIR)/* $3
!         ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5)
!         $(RM) -rf $3/$$($4_TMPDIR)
  endef
  
  define SetupIdlCompilation
  # param 1 is for example BUILD_IDLS
  # param 2,3,4,5,6,7,8 are named args.
*** 91,101 ****
  
  # Remove any relative addressing in the paths.
  $1_SRC := $$(abspath $$($1_SRC))
  $1_BIN := $$(abspath $$($1_BIN))
  # Find all existing java files and existing class files.
! $$(shell mkdir -p $$($1_SRC) $$($1_BIN))
  $1_SRCS     := $$(shell find $$($1_SRC) -name "*.idl")
  $1_BINS     := $$(shell find $$($1_BIN) -name "*.java")
  # Prepend the source/bin path to the filter expressions.
  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))
--- 91,101 ----
  
  # Remove any relative addressing in the paths.
  $1_SRC := $$(abspath $$($1_SRC))
  $1_BIN := $$(abspath $$($1_BIN))
  # Find all existing java files and existing class files.
! $$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN))
  $1_SRCS     := $$(shell find $$($1_SRC) -name "*.idl")
  $1_BINS     := $$(shell find $$($1_BIN) -name "*.java")
  # Prepend the source/bin path to the filter expressions.
  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))