diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 16:15:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 16:15:51 +0000 |
| commit | 6a4d1b36ca338946ba90995db66651ace2fa1197 (patch) | |
| tree | f2c3ba34c9c35559a8c7989d9a6c56518d805d2d /sal/util | |
| parent | 2a405c81aacdb3b395e0071449d19e60a413056f (diff) | |
INTEGRATION: CWS pj85 (1.44.16); FILE MERGED
2007/10/13 18:53:27 pjanik 1.44.16.1: #i78467#: Remove old Mac code.
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 4e70e729a..6aaf76073 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.45 $ +# $Revision: 1.46 $ # -# last change: $Author: vg $ $Date: 2007-10-15 12:52:59 $ +# last change: $Author: hr $ $Date: 2007-11-01 17:15:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -120,13 +120,6 @@ SHL1STDLIBS= \ $(OLE32LIB) .ENDIF # WNT -.IF "$(GUI)"=="MAC" -SHL1STDLIBS=-L$(shell $(UNIX2MACPATH) $(MW_HOME)$/Metrowerks\ CodeWarrior$/MacOS\ Support$/OpenTransport$/Open\ Tpt\ Client\ Developer$/PPC\ Libraries) \ - -weakimport -lOpenTransportLib -weakimport -lOpenTptInternetLib \ - -lOpenTransportExtnPPC.o -lOpenTptInetPPC.o -SHL1STDLIBS+=-init InitLibrary -term ExitLibrary -.ENDIF # MAC - .IF "$(GUI)"=="UNX" .IF "$(OS)"=="SOLARIS" # libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7) @@ -179,15 +172,10 @@ SHL11FILE=$(MISC)$/sal.slo .IF "$(GUI)"=="UNX" SHL1OBJS= .ELSE -.IF "$(GUI)"=="MAC" -SHL1OBJS= \ - $(OBJ)$/dllentry.obj -.ELSE .IF "$(GUI)$(COM)"!="WNTGCC" SHL1OBJS= \ $(SLO)$/dllentry.obj .ENDIF # WNTGCC -.ENDIF # MAC .ENDIF # UNX .ENDIF # lincinc |