summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vesik <svesik@openoffice.org>2001-02-02 18:16:28 +0000
committerSander Vesik <svesik@openoffice.org>2001-02-02 18:16:28 +0000
commitf0a38ae933956488d3dfac64718528b04ea23702 (patch)
tree39d9941df0f6b1d6ae102bd0fbbc7beba14ce363
parent3aefc5bba9737f5609d5e5e265113eead7f3a379 (diff)
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
-rw-r--r--UnoControls/source/base/makefile.mk8
-rw-r--r--UnoControls/source/controls/makefile.mk8
-rw-r--r--extensions/source/resource/makefile.mk8
3 files changed, 9 insertions, 15 deletions
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
index 266225ff1109..e0297b494652 100644
--- a/UnoControls/source/base/makefile.mk
+++ b/UnoControls/source/base/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: pluby $ $Date: 2000-10-06 16:30:31 $
+# last change: $Author: svesik $ $Date: 2001-02-02 19:16:27 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -78,10 +78,8 @@ SLOFILES= $(SLO)$/multiplexer.obj \
$(SLO)$/basecontainercontrol.obj \
$(SLO)$/registercontrols.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)$/staticmbbase.obj
.ENDIF
diff --git a/UnoControls/source/controls/makefile.mk b/UnoControls/source/controls/makefile.mk
index 91faebb4494f..0c2cca68c869 100644
--- a/UnoControls/source/controls/makefile.mk
+++ b/UnoControls/source/controls/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: as $ $Date: 2000-10-12 10:31:55 $
+# last change: $Author: svesik $ $Date: 2001-02-02 19:16:28 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -77,10 +77,8 @@ SLOFILES=\
$(SLO)$/OConnectionPointContainerHelper.obj \
$(SLO)$/statusindicator.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)$/staticmbcontrols.obj
.ENDIF
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
index fdc99ea6900f..4d8b4487a80e 100644
--- a/extensions/source/resource/makefile.mk
+++ b/extensions/source/resource/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: patrick.luby $ $Date: 2000-09-28 04:20:24 $
+# last change: $Author: svesik $ $Date: 2001-02-02 18:55:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -80,10 +80,8 @@ SLOFILES= $(SLO)$/resource.obj
EXCEPTIONSFILES= $(SLO)$/resource.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 m ultiple defined symbols
-.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
EXCEPTIONSFILES+=$(SLO)$/staticmbresource.obj
.ENDIF