summaryrefslogtreecommitdiff
path: root/rdbmaker/source
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2001-03-02 06:21:44 +0000
committerPatrick Luby <pluby@openoffice.org>2001-03-02 06:21:44 +0000
commita03ddd50b97f45535a0cff268b8e8744941fbc79 (patch)
treeb828238e38d2d3ac3c001fea827646fe9fd2b87b /rdbmaker/source
parente6bbfe488360868ce798b45404945e2ef67cff00 (diff)
Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process
Diffstat (limited to 'rdbmaker/source')
-rw-r--r--rdbmaker/source/rdbmaker/makefile.mk14
1 files changed, 2 insertions, 12 deletions
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 2833b9d6d154..6bd215ff842c 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: pluby $ $Date: 2001-02-12 03:25:38 $
+# last change: $Author: pluby $ $Date: 2001-03-02 07:16:21 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -100,11 +100,6 @@ CXXFILES= rdbmaker.cxx \
specialtypemanager.cxx \
rdbtype.cxx
-# 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"
-CXXFILES+=staticmbrdbmaker.cxx
-.ENDIF
-
APP1TARGET= $(TARGET)
APP1OBJS= $(OBJ)$/rdbmaker.obj \
@@ -113,11 +108,6 @@ APP1OBJS= $(OBJ)$/rdbmaker.obj \
$(OBJ)$/specialtypemanager.obj \
$(OBJ)$/rdbtype.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"
-APP1OBJS+=$(OBJ)$/staticmbrdbmaker.obj
-.ENDIF
-
APP1STDLIBS=\
$(SALLIB) \
$(VOSLIB) \