1.1 --- a/common/makefiles/IdlCompilation.gmk Tue Jul 03 16:11:12 2012 -0700
1.2 +++ b/common/makefiles/IdlCompilation.gmk Thu Jul 05 18:27:07 2012 -0700
1.3 @@ -56,10 +56,10 @@
1.4 $4_OLDIMPLBASE_MSG:=with -oldImplBase
1.5 endif
1.6 $5 : $4
1.7 - mkdir -p $3/$$($4_TMPDIR)
1.8 - rm -rf $3/$$($4_TMPDIR)
1.9 - mkdir -p $(dir $5)
1.10 - echo Compiling IDL $(patsubst $2/%,%,$4)
1.11 + $(MKDIR) -p $3/$$($4_TMPDIR)
1.12 + $(RM) -rf $3/$$($4_TMPDIR)
1.13 + $(MKDIR) -p $(dir $5)
1.14 + $(ECHO) Compiling IDL $(patsubst $2/%,%,$4)
1.15 $8 -td $3/$$($4_TMPDIR) \
1.16 -i $2/org/omg/CORBA \
1.17 -i $2/org/omg/PortableInterceptor \
1.18 @@ -69,10 +69,10 @@
1.19 $$($4_OLDIMPLBASE) \
1.20 $(PREFIXES) \
1.21 $4
1.22 - rm -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
1.23 - cp -rp $3/$$($4_TMPDIR)/* $3
1.24 - (cd $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5)
1.25 - rm -rf $3/$$($4_TMPDIR)
1.26 + $(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
1.27 + $(CP) -rp $3/$$($4_TMPDIR)/* $3
1.28 + ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5)
1.29 + $(RM) -rf $3/$$($4_TMPDIR)
1.30 endef
1.31
1.32 define SetupIdlCompilation
1.33 @@ -93,7 +93,7 @@
1.34 $1_SRC := $$(abspath $$($1_SRC))
1.35 $1_BIN := $$(abspath $$($1_BIN))
1.36 # Find all existing java files and existing class files.
1.37 -$$(shell mkdir -p $$($1_SRC) $$($1_BIN))
1.38 +$$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN))
1.39 $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
1.40 $1_BINS := $$(shell find $$($1_BIN) -name "*.java")
1.41 # Prepend the source/bin path to the filter expressions.
