diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:06:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:06:49 +0000 |
| commit | f4cb522c06c5518c9a5f8ffa2a48d7ca25e27b9e (patch) | |
| tree | b5d33069794be73e16ce3d40e423e8dd278f0bae /framework/test | |
| parent | eaa6a2437f0857d47c6a0ebe887984346d85c9c6 (diff) | |
INTEGRATION: CWS geordi2q14 (1.9.76); FILE MERGED
2004/01/29 16:05:55 hr 1.9.76.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'framework/test')
| -rw-r--r-- | framework/test/typecfg/makefile.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk index cb335bdfd493..03db2da57170 100644 --- a/framework/test/typecfg/makefile.mk +++ b/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 |