diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:20:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:20:09 +0000 |
| commit | a1f5aef13561919eb31cd336a4ce2abcb6975261 (patch) | |
| tree | b2668e37f6afd525c1d2b46d86f98fd4b6a0ced0 /shell/source | |
| parent | fed1b3cfddcac352364fc1643bc176c4a581aebc (diff) | |
INTEGRATION: CWS geordi2q14 (1.3.22); FILE MERGED
2004/01/30 11:22:24 hr 1.3.22.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'shell/source')
| -rw-r--r-- | shell/source/unix/sysshell/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk index b8dbf044c1e1..d5af1da1dc07 100644 --- a/shell/source/unix/sysshell/makefile.mk +++ b/shell/source/unix/sysshell/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2003-09-29 14:54:36 $ +# last change: $Author: hr $ $Date: 2004-02-02 19:20:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,7 +81,13 @@ SLOFILES=$(SLO)$/recently_used_file.obj \ $(SLO)$/recently_used_file_handler.obj SHL1TARGET=recentfile + +# static libs must come at end of linker list on MacOSX +.IF "$(OS)" == "MACOSX" +SHL1STDLIBS= $(SALLIB) $(EXPATASCII3RDLIB) +.ELSE SHL1STDLIBS=$(EXPATASCII3RDLIB) $(SALLIB) +.ENDIF # MACOSX SHL1LIBS=$(SLB)$/xmlparser.lib SHL1OBJS=$(SLOFILES) |