summaryrefslogtreecommitdiff
path: root/sax/test/makefile.mk
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2001-02-15 00:11:32 +0000
committerPatrick Luby <pluby@openoffice.org>2001-02-15 00:11:32 +0000
commit989594437a14eefd80624a7ca2582769a56f07d2 (patch)
tree7dd6cf66ff1b1b4bbce9ff7c0eefbbf4536cd387 /sax/test/makefile.mk
parent54748f685cb30a7513fd4de67e710201217c4f72 (diff)
Update for Mac OS X
Diffstat (limited to 'sax/test/makefile.mk')
-rw-r--r--sax/test/makefile.mk9
1 files changed, 6 insertions, 3 deletions
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 ------------------------------------------------------