From 989594437a14eefd80624a7ca2582769a56f07d2 Mon Sep 17 00:00:00 2001
From: Patrick Luby <pluby@openoffice.org>
Date: Thu, 15 Feb 2001 00:11:32 +0000
Subject: Update for Mac OS X

---
 sax/test/makefile.mk     | 9 ++++++---
 sax/test/sax/makefile.mk | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'sax')

diff --git a/sax/test/makefile.mk b/sax/test/makefile.mk
index 451e999f01ea..8a99b351d6b2 100644
--- a/sax/test/makefile.mk
+++ b/sax/test/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 16:43:13 $
+#   last change: $Author: pluby $ $Date: 2001-02-15 01:11:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,12 +89,15 @@ APP1STDLIBS = 	$(SALLIB) \
         $(CPPULIB)\
         $(CPPUHELPERLIB)
 
-
 APP2OBJS   = $(OBJ)$/saxdemo.obj
 APP2STDLIBS = 	$(SALLIB) \
         $(CPPULIB) \
         $(CPPUHELPERLIB)
 
+# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+APP2OBJS+=$(OBJ)$/staticmbtest.obj   
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sax/test/sax/makefile.mk b/sax/test/sax/makefile.mk
index 062b3073243d..af953edabe3a 100644
--- a/sax/test/sax/makefile.mk
+++ b/sax/test/sax/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 16:43:13 $
+#   last change: $Author: pluby $ $Date: 2001-02-15 01:11:32 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,6 +76,10 @@ ENABLE_EXCEPTIONS=TRUE
 SLOFILES = 	$(SLO)$/testsax.obj \
         $(SLO)$/testwriter.obj
 
+# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+SLOFILES+=$(SLO)$/staticmbtestsax.obj
+.ENDIF
 
 SHL1TARGET= $(TARGET)
 SHL1IMPLIB=		i$(TARGET)
-- 
cgit