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/property/makefile.mk | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'unotools/source/property/makefile.mk')

diff --git a/unotools/source/property/makefile.mk b/unotools/source/property/makefile.mk
index 920773628270..0e806d4bb439 100644
--- a/unotools/source/property/makefile.mk
+++ b/unotools/source/property/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: fs $ $Date: 2000-09-21 08:52:39 $
+#   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
@@ -92,11 +92,20 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files -------------------------------------
 
-SLOFILES=	$(SLO)$/propertycontainer.obj \
-            $(SLO)$/property.obj \
-            $(SLO)$/propmultiplex.obj \
-            $(SLO)$/propstate.obj \
-            $(SLO)$/propagg.obj \
+SLOFILES=	$(SLO)$/propertycontainer.obj  \
+        $(SLO)$/property.obj           \
+        $(SLO)$/propmultiplex.obj      \
+        $(SLO)$/propstate.obj          \
+        $(SLO)$/propagg.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)$/staticmbproperty.obj
+.ENDIF
 
 # --- Targets ----------------------------------
 
-- 
cgit v1.2.3