corba/make/CompileCorba.gmk

@@ -43,29 +43,30 @@
         com/sun/org/omg/CORBA/IDLTypeOperations.java \
         com/sun/org/omg/CORBA/IRObjectOperations.java \
         org/omg/PortableInterceptor/UNKNOWN.java \
         com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
         com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
-    COPY := .prp LogStrings.properties, \
+    COPY := .prp, \
+    CLEAN := .properties, \
     BIN := $(CORBA_OUTPUTDIR)/classes, \
     JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
 
 $(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(BUILD_CORBA_SRC), \
     EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
     EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
     COPY := $(BUILD_CORBA_COPY), \
+    CLEAN := $(BUILD_CORBA_CLEAN), \
     BIN := $(CORBA_OUTPUTDIR)/interim_classes, \
     JAR := $(INTERIM_CORBA_JAR)))
 
 # Separate src.zip call to include sources that were excluded in the build to
 # mimic behavior in old build system.
 $(eval $(call SetupZipArchive,ARCHIVE_CORBA_SRC, \
     SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
     ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip))
-    JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
 
 ################################################################################
 # Create bin.zip containing the corba specific binaries: orb.idl, ir.idl
 BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
     $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl

@@ -79,8 +80,7 @@
         $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
         (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
 
 ################################################################################
 
-
 all: $(BUILD_CORBA) $(BUILD_INTERIM_CORBA) $(ARCHIVE_CORBA_SRC) \
     $(CORBA_OUTPUTDIR)/dist/lib/bin.zip