diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:40:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:40:35 +0000 |
| commit | 45ac3ca2ee5a793c61d61a960827434eb43480f3 (patch) | |
| tree | 1efc4ea30f828e913aff5d4cc519382869941990 /framework/test | |
| parent | c7a6d9dd46b5ede0f7f3cde1ea7421d98618bf15 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.8.56); FILE MERGED
2003/07/15 06:22:02 fa 1.8.56.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16868
Dan
fa@ooo
Diffstat (limited to 'framework/test')
| -rw-r--r-- | framework/test/typecfg/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk index 6521c83ef091..cb335bdfd493 100644 --- a/framework/test/typecfg/makefile.mk +++ b/framework/test/typecfg/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2003-03-25 18:22:06 $ +# last change: $Author: hr $ $Date: 2003-07-16 17:40:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,7 +92,7 @@ APP2OBJS= $(SLO)$/cfgview.obj \ $(SLO)$/lockhelper.obj # [ed] 6/16/02 Add in the transactionmanager object on OS X -.IF "$(OS)"=="MACOSX" +.IF "$(OS)$(CVER)"=="MACOSXC295" APP2OBJS+= $(SLO)$/transactionmanager.obj .ENDIF @@ -115,7 +115,7 @@ APP2DEPN= $(SLO)$/servicemanager.obj \ $(SLO)$/lockhelper.obj # [ed] 6/16/02 Add in the transactionmanager object on OS X -.IF "$(OS)"=="MACOSX" +.IF "$(OS)$(CVER)"=="MACOSXC295" APP2DEPN+= $(SLO)$/transactionmanager.obj .ENDIF |