diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:23:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:23:32 +0000 |
| commit | 20da1920c1f7678457f5b24f924217f4e673ab2a (patch) | |
| tree | 1acb4918bf7224ba339496fe91bd86b55c7acf1e /sal/util/makefile.mk | |
| parent | 7ac4b0030c7f175d3ae5235aec4e11e6174aff8d (diff) | |
INTEGRATION: CWS ooo11rc2 (1.30.50); FILE MERGED
2003/07/14 18:31:49 fa 1.30.50.2: Add in PORTS OS X locale discovery code including external
locale discovery dylib, also utility functions for OS X
port in system.c and other misc OS X porting changes.
This commit does NOT include the interlck.c asm code for
PPC.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16607
Dan
fa@ooo
2003/07/14 16:13:15 mh 1.30.50.1: add: patch for Irix, #i16225#
Diffstat (limited to 'sal/util/makefile.mk')
| -rw-r--r-- | sal/util/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 515da4d89..33315c1f8 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: vg $ $Date: 2003-04-15 13:48:07 $ +# last change: $Author: hr $ $Date: 2003-07-16 17:23:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -154,8 +154,15 @@ SHL1STDLIBS= -Bdynamic -ldl -lpthread -lposix4 -lsocket -lnsl SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract .ENDIF # C50 .ENDIF # SOLARIS +.IF "$(OS)"=="IRIX" +SHL1STDLIBS= -lexc +.ENDIF .ENDIF # UNX +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS+=-lstlport_gcc -framework CoreFoundation +.ENDIF + SHL1LIBS+=$(SLB)$/$(TARGET).lib .IF "$(linkinc)" != "" |