summaryrefslogtreecommitdiff
path: root/unotools/source
diff options
context:
space:
mode:
authorBabak Mahbod <bmahbod@openoffice.org>2000-10-06 22:53:16 +0000
committerBabak Mahbod <bmahbod@openoffice.org>2000-10-06 22:53:16 +0000
commita522f25e656944d4474d05f23d9eeeee6adebd83 (patch)
tree279dc142ae944f1d72497a2c3d6e6d5cfbaeb9ce /unotools/source
parenta9ac5f8eaf70158afbef4299362b5f7a38e118fb (diff)
Updated for use with MacOS X strict ANSI C++ compiler.
Diffstat (limited to 'unotools/source')
-rw-r--r--unotools/source/config/makefile.mk17
-rw-r--r--unotools/source/misc/makefile.mk27
-rw-r--r--unotools/source/property/makefile.mk23
-rw-r--r--unotools/source/streaming/makefile.mk25
-rw-r--r--unotools/source/ucbhelper/makefile.mk13
5 files changed, 75 insertions, 30 deletions
diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk
index 30f5f4c7872b..bf411abaa6ac 100644
--- a/unotools/source/config/makefile.mk
+++ b/unotools/source/config/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 17:03:54 $
+# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:13 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -94,8 +94,17 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files -------------------------------------
SLOFILES=\
- $(SLO)$/configitem.obj \
- $(SLO)$/configmgr.obj \
+ $(SLO)$/configitem.obj \
+ $(SLO)$/configmgr.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"
+SLOFILES+=$(SLO)$/staticmbconfig.obj
+.ENDIF
# --- Targets ----------------------------------
diff --git a/unotools/source/misc/makefile.mk b/unotools/source/misc/makefile.mk
index 474d193111e4..8ce33d135f9b 100644
--- a/unotools/source/misc/makefile.mk
+++ b/unotools/source/misc/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 17:03:54 $
+# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -97,15 +97,24 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files -------------------------------------
-SLOFILES= $(SLO)$/types.obj \
- $(SLO)$/datetime.obj \
- $(SLO)$/numbers.obj \
- $(SLO)$/guarding.obj \
- $(SLO)$/sequence.obj \
- $(SLO)$/querydeep.obj \
- $(SLO)$/regpathhelper.obj \
+SLOFILES= $(SLO)$/types.obj \
+ $(SLO)$/datetime.obj \
+ $(SLO)$/numbers.obj \
+ $(SLO)$/guarding.obj \
+ $(SLO)$/sequence.obj \
+ $(SLO)$/querydeep.obj \
+ $(SLO)$/regpathhelper.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"
+SLOFILES+=$(SLO)$/staticmbmisc.obj
+.ENDIF
+
# --- Targets ----------------------------------
.INCLUDE : target.mk
diff --git a/unotools/source/property/makefile.mk b/unotools/source/property/makefile.mk
index 920773628270..0e806d4bb439 100644
--- a/unotools/source/property/makefile.mk
+++ b/unotools/source/property/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: fs $ $Date: 2000-09-21 08:52:39 $
+# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -92,11 +92,20 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files -------------------------------------
-SLOFILES= $(SLO)$/propertycontainer.obj \
- $(SLO)$/property.obj \
- $(SLO)$/propmultiplex.obj \
- $(SLO)$/propstate.obj \
- $(SLO)$/propagg.obj \
+SLOFILES= $(SLO)$/propertycontainer.obj \
+ $(SLO)$/property.obj \
+ $(SLO)$/propmultiplex.obj \
+ $(SLO)$/propstate.obj \
+ $(SLO)$/propagg.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"
+SLOFILES+=$(SLO)$/staticmbproperty.obj
+.ENDIF
# --- Targets ----------------------------------
diff --git a/unotools/source/streaming/makefile.mk b/unotools/source/streaming/makefile.mk
index 7b9fbcb8d21a..beb3861d82b4 100644
--- a/unotools/source/streaming/makefile.mk
+++ b/unotools/source/streaming/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 17:03:55 $
+# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -93,12 +93,21 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files -------------------------------------
-SLOFILES= $(SLO)$/basicio.obj \
- $(SLO)$/streamsection.obj \
- $(SLO)$/streamhelper.obj \
- $(SLO)$/streamwrap.obj \
- $(SLO)$/seqstream.obj \
- $(SLO)$/oslfile2streamwrap.obj
+SLOFILES= $(SLO)$/basicio.obj \
+ $(SLO)$/streamsection.obj \
+ $(SLO)$/streamhelper.obj \
+ $(SLO)$/streamwrap.obj \
+ $(SLO)$/seqstream.obj \
+ $(SLO)$/oslfile2streamwrap.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"
+SLOFILES+=$(SLO)$/staticmbstreaming.obj
+.ENDIF
# --- Targets ----------------------------------
diff --git a/unotools/source/ucbhelper/makefile.mk b/unotools/source/ucbhelper/makefile.mk
index c92168f1bdce..45ff30729eab 100644
--- a/unotools/source/ucbhelper/makefile.mk
+++ b/unotools/source/ucbhelper/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: mba $ $Date: 2000-09-27 12:27:32 $
+# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -95,6 +95,15 @@ ENABLE_EXCEPTIONS=TRUE
SLOFILES=\
$(SLO)$/ucblockbytes.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"
+SLOFILES+=$(SLO)$/staticmbucbhelper.obj
+.ENDIF
+
# --- Targets ----------------------------------
.INCLUDE : target.mk