summaryrefslogtreecommitdiff
path: root/eventattacher/source
diff options
context:
space:
mode:
authorSander Vesik <svesik@openoffice.org>2001-02-02 18:16:28 +0000
committerSander Vesik <svesik@openoffice.org>2001-02-02 18:16:28 +0000
commit46a96b719721b97c38654969d6d689c934405f92 (patch)
tree940bfff39eaeb80e422bfc6d7e44d360b4b0893a /eventattacher/source
parentf95fa3b3c88f81f3af52989106d513d30f220f21 (diff)
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'eventattacher/source')
-rw-r--r--eventattacher/source/makefile.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk
index e0d2f4f11f6d..8f56ac6b07e8 100644
--- a/eventattacher/source/makefile.mk
+++ b/eventattacher/source/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:15:25 $
+# last change: $Author: svesik $ $Date: 2001-02-02 19:06:24 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -104,10 +104,8 @@ UNOTYPES= \
SLOFILES= \
$(SLO)$/eventattacher.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"
+.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
SLOFILES+=$(SLO)$/staticmb.obj
.ENDIF