diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-03-02 06:21:44 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-03-02 06:21:44 +0000 |
| commit | b8539a00300c9edab05bd847c3861cbd18a6904d (patch) | |
| tree | 436092afa616774f1fccea3d1b5543e5cbd2f01b /remotebridges | |
| parent | 3c40b2e75d247a6e1e03e94b784955952f250154 (diff) | |
Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process
Diffstat (limited to 'remotebridges')
| -rwxr-xr-x | remotebridges/source/dynamicloader/makefile.mk | 9 | ||||
| -rw-r--r-- | remotebridges/source/factory/makefile.mk | 9 | ||||
| -rw-r--r-- | remotebridges/source/unourl_resolver/makefile.mk | 9 |
3 files changed, 6 insertions, 21 deletions
diff --git a/remotebridges/source/dynamicloader/makefile.mk b/remotebridges/source/dynamicloader/makefile.mk index 2d8e73ebe..1735dbd9e 100755 --- a/remotebridges/source/dynamicloader/makefile.mk +++ b/remotebridges/source/dynamicloader/makefile.mk @@ -3,8 +3,8 @@ #* $Workfile: makefile $ #* #* Ersterstellung JSC 24.06.99 -#* Letzte Aenderung $Author: pluby $ $Date: 2001-02-12 01:33:28 $ -#* $Revision: 1.4 $ +#* Letzte Aenderung $Author: pluby $ $Date: 2001-03-02 07:16:26 $ +#* $Revision: 1.5 $ #* #* $Logfile:$ #* @@ -41,11 +41,6 @@ INCPRE+=$(UNOUCROUT) SLOFILES= \ $(SLO)$/dynamicloader.obj -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" -SLOFILES+=$(SLO)$/staticmbdynamic.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS=\ diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk index 1e707d423..b613b5336 100644 --- a/remotebridges/source/factory/makefile.mk +++ b/remotebridges/source/factory/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:30 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:16:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,11 +81,6 @@ SLOFILES= \ $(SLO)$/bridgefactory.obj\ $(SLO)$/bridgeimpl.obj -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" -SLOFILES+=$(SLO)$/staticmbfactory.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk index c6ca21151..8a6efcbe0 100644 --- a/remotebridges/source/unourl_resolver/makefile.mk +++ b/remotebridges/source/unourl_resolver/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 19:51:56 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:16:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,11 +98,6 @@ UNOTYPES= \ SLOFILES= \ $(SLO)$/unourl_resolver.obj -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" -SLOFILES+=$(SLO)$/staticmb.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ |