INTEGRATION: CWS geordi2q14 (1.9.76); FILE MERGED

2004/01/29 16:05:55 hr 1.9.76.1: #111934#: merge CWS ooo111fix2

framework/test/typecfg/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: hr $ $Date: 2003-07-16 17:40:35 $
+#   last change: $Author: hr $ $Date: 2004-02-02 23:06:49 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -91,11 +91,6 @@ APP2OBJS=		$(SLO)$/cfgview.obj					\
                 $(SLO)$/wildcard.obj				\
                 $(SLO)$/lockhelper.obj
 
-# [ed] 6/16/02 Add in the transactionmanager object on OS X
-.IF "$(OS)$(CVER)"=="MACOSXC295"
-APP2OBJS+=	$(SLO)$/transactionmanager.obj
-.ENDIF
-
 APP2STDLIBS=	$(CPPULIB)							\
                 $(CPPUHELPERLIB)					\
                 $(OSLLIB)							\
@@ -114,11 +109,6 @@ APP2DEPN=		$(SLO)$/servicemanager.obj			\
                 $(SLO)$/wildcard.obj				\
                 $(SLO)$/lockhelper.obj
 
-# [ed] 6/16/02 Add in the transactionmanager object on OS X
-.IF "$(OS)$(CVER)"=="MACOSXC295"
-APP2DEPN+=	$(SLO)$/transactionmanager.obj
-.ENDIF
-
 .IF "$(GUI)"=="WIN" || "$(GUI)"=="OS2"
 APP2DEF=        $(MISC)$/cfgview.def
 .ENDIF