summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rdbmaker/source/rdbmaker/makefile.mk20
1 files changed, 18 insertions, 2 deletions
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 36805587c..8f81b934a 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: pluby $ $Date: 2000-10-09 16:52:55 $
+# last change: $Author: ganaya $ $Date: 2000-10-09 17:17:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -100,6 +100,14 @@ CXXFILES= rdbmaker.cxx \
specialtypemanager.cxx \
rdbtype.cxx
+# 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"
+CXXFILES+=staticmbrdbmaker.cxx
+.ENDIF
+
APP1TARGET= $(TARGET)
@@ -109,6 +117,14 @@ APP1OBJS= $(OBJ)$/rdbmaker.obj \
$(OBJ)$/specialtypemanager.obj \
$(OBJ)$/rdbtype.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 GCCwon'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"
+APP1OBJS+=$(OBJ)$/staticmbrdbmaker.obj
+.ENDIF
+
+
APP1STDLIBS=\
$(SALLIB) \
$(VOSLIB) \