summaryrefslogtreecommitdiff
path: root/comphelper/source/streaming/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source/streaming/makefile.mk')
-rw-r--r--comphelper/source/streaming/makefile.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/comphelper/source/streaming/makefile.mk b/comphelper/source/streaming/makefile.mk
index 891c4d5203fd..6696b506708d 100644
--- a/comphelper/source/streaming/makefile.mk
+++ b/comphelper/source/streaming/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: fs $ $Date: 2000-09-29 11:28:15 $
+# last change: $Author: pluby $ $Date: 2000-10-07 21:13:53 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -77,6 +77,13 @@ SLOFILES= $(SLO)$/basicio.obj \
$(SLO)$/seqstream.obj \
$(SLO)$/streamsection.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"
+SLOFILES+=$(SLO)$/staticmbstreaming.obj
+.ENDIF
+
# --- Targets ----------------------------------
.INCLUDE : target.mk