INTEGRATION: CWS jl13 (1.2.164); FILE MERGED

2004/10/11 14:33:50 jl 1.2.164.2: #i29390#
2004/10/11 14:31:46 jl 1.2.164.1: #i29390#

stoc/test/javavm/testcomponent/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: jl $ $Date: 2002-05-22 12:51:00 $
+#   last change: $Author: hr $ $Date: 2004-11-09 13:54:16 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,16 +73,19 @@ TARGET  = JavaTestComponent
 # Files --------------------------------------------------------
 JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar
 
-JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
+CUSTOMMANIFESTFILE= manifest
+
+JARTARGET = $(TARGET).jar
+
+JAVAFILES= \
+    TestComponent.java
+
+
+JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
 
 
-JAVACLASSFILES= \
-    $(CLASSDIR)$/$(PACKAGE)$/TestComponent.class 	
 
-JARCLASSDIRS= .
-JARTARGET		= $(TARGET).jar
-JARCOMPRESS= TRUE
-CUSTOMMANIFESTFILE= .$/manifest
 
 # --- Targets ------------------------------------------------------