INTEGRATION: CWS jl13 (1.6.22); FILE MERGED

2004/10/21 13:17:51 jl 1.6.22.4: RESYNC: (1.6-1.7); FILE MERGED
2004/10/08 17:31:04 jl 1.6.22.3: #29930#
2004/10/08 11:13:00 jl 1.6.22.2: #i29390#
2004/09/29 13:43:51 jl 1.6.22.1: #i29390# using framework in other applications

jvmfwk/source/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: rt $ $Date: 2004-09-08 16:04:05 $
+#   last change: $Author: hr $ $Date: 2004-11-09 14:02:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -81,7 +81,8 @@ SLOFILES = \
     $(SLO)$/framework.obj \
     $(SLO)$/libxmlutil.obj \
     $(SLO)$/fwkutil.obj \
-    $(SLO)$/elements.obj
+    $(SLO)$/elements.obj \
+    $(SLO)$/fwkbase.obj
 
 
 #LIB1TARGET=$(SLB)$/$(FRAMEWORKLIB).lib
@@ -105,5 +106,18 @@ SHL1STDLIBS += advapi32.lib
 SHL1VERSIONMAP = framework.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME = $(SHL1TARGET)
+
+.IF "$(GUI)"=="UNX"
+RCFILE=$(BIN)$/jvmfwk3rc
+.ELIF "$(GUI)"=="WNT"
+RCFILE=$(BIN)$/jvmfwk3.ini
+.END
+
+
 .INCLUDE: target.mk
+$(RCFILE): jvmfwk3rc
+    +-$(COPY) $< $@
+
+ALLTAR: \
+    $(RCFILE)