diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:02:57 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:02:57 +0000 |
| commit | f17a27a1c330303f52f1d992dc9ea7382e29de04 (patch) | |
| tree | 698070d550ac0a41947c497b68cc182ce2f7590d /automation/util | |
| parent | 4b36b6f62b3e46901fd7a7dc1336cbd93ee516b2 (diff) | |
INTEGRATION: CWS geordi2q01 (1.6.16); FILE MERGED
2003/08/18 12:40:52 hr 1.6.16.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'automation/util')
| -rw-r--r-- | automation/util/makefile.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 6f7eaaf4a6e4..62d8bb226e03 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: vg $ $Date: 2003-06-12 11:07:29 $ +# last change: $Author: hjs $ $Date: 2003-08-18 15:02:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -164,9 +164,10 @@ APP1STDLIBS+= -lXm .IF "$(GUI)" == "UNX" .IF "$(OS)" == "LINUX" - APP1STDLIBS+= -lXext -lX11 -lSM -lICE - +.ENDIF +.IF "$(OS)"=="MACOSX" +APP1STDLIBS+= -lapp -lsample .ENDIF .ENDIF @@ -204,9 +205,14 @@ APP3STDLIBS= \ $(SJLIB) \ $(SO2LIB) .IF "$(GUI)"=="UNX" +.IF "$(OS)"=="MACOSX" +APP3STDLIBS+= \ + $(VOSLIB) $(SALLIB) $(LIBSTLPORT) +.ELSE APP3STDLIBS+= \ $(VOSLIB) $(SALLIB) .ENDIF +.ENDIF APP3LIBS= \ $(LIBPRE) $(LB)$/miniapp.lib |