diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-12 00:33:49 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-12 00:33:49 +0000 |
| commit | 996e516e1e0d2d1003d82faff8409355878fb69f (patch) | |
| tree | a45b400a037180587c6f696061f4d4c42088050c /remotebridges | |
| parent | 9aca8f724252aca906f07a80962c03b9281b811b (diff) | |
Removed NETBSD from staticmb*.cxx compiling
Diffstat (limited to 'remotebridges')
| -rwxr-xr-x | remotebridges/source/dynamicloader/makefile.mk | 8 | ||||
| -rw-r--r-- | remotebridges/source/factory/makefile.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/remotebridges/source/dynamicloader/makefile.mk b/remotebridges/source/dynamicloader/makefile.mk index b75547691..2d8e73ebe 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: hjs $ $Date: 2001-01-16 12:04:17 $ -#* $Revision: 1.3 $ +#* Letzte Aenderung $Author: pluby $ $Date: 2001-02-12 01:33:28 $ +#* $Revision: 1.4 $ #* #* $Logfile:$ #* @@ -41,10 +41,8 @@ INCPRE+=$(UNOUCROUT) SLOFILES= \ $(SLO)$/dynamicloader.obj -# NETBSD: somewhere we have to instantiate the static data members. -# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work. # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbdynamic.obj .ENDIF diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk index 0bb6727e3..1e707d423 100644 --- a/remotebridges/source/factory/makefile.mk +++ b/remotebridges/source/factory/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hjs $ $Date: 2001-01-16 11:48:19 $ +# last change: $Author: pluby $ $Date: 2001-02-12 01:33:30 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,10 +81,8 @@ SLOFILES= \ $(SLO)$/bridgefactory.obj\ $(SLO)$/bridgeimpl.obj -# NETBSD: somewhere we have to instantiate the static data members. -# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work. # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbfactory.obj .ENDIF |