From a522f25e656944d4474d05f23d9eeeee6adebd83 Mon Sep 17 00:00:00 2001
From: Babak Mahbod <bmahbod@openoffice.org>
Date: Fri, 6 Oct 2000 22:53:16 +0000
Subject: Updated for use with MacOS X strict ANSI C++ compiler.

---
 unotools/source/streaming/makefile.mk | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'unotools/source/streaming')

diff --git a/unotools/source/streaming/makefile.mk b/unotools/source/streaming/makefile.mk
index 7b9fbcb8d21a..beb3861d82b4 100644
--- a/unotools/source/streaming/makefile.mk
+++ b/unotools/source/streaming/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 17:03:55 $
+#   last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:15 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -93,12 +93,21 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files -------------------------------------
 
-SLOFILES=	$(SLO)$/basicio.obj \
-            $(SLO)$/streamsection.obj \
-            $(SLO)$/streamhelper.obj \
-            $(SLO)$/streamwrap.obj \
-            $(SLO)$/seqstream.obj \
-            $(SLO)$/oslfile2streamwrap.obj
+SLOFILES=	$(SLO)$/basicio.obj             \
+        $(SLO)$/streamsection.obj       \
+        $(SLO)$/streamhelper.obj        \
+        $(SLO)$/streamwrap.obj          \
+        $(SLO)$/seqstream.obj           \
+        $(SLO)$/oslfile2streamwrap.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 ----------------------------------
 
-- 
cgit