From e2efb71af3be53598a4ae78dd145c2567d559736 Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Fri, 2 Mar 2001 06:21:44 +0000 Subject: Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process --- unotools/source/config/makefile.mk | 13 ++----------- unotools/source/i18n/makefile.mk | 12 ++---------- unotools/source/misc/makefile.mk | 10 ++-------- unotools/source/streaming/makefile.mk | 13 ++----------- unotools/source/ucbhelper/makefile.mk | 13 ++----------- 5 files changed, 10 insertions(+), 51 deletions(-) (limited to 'unotools/source') diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk index bf411abaa6ac..e45e3cbcd1a1 100644 --- a/unotools/source/config/makefile.mk +++ b/unotools/source/config/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:13 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:20:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -97,15 +97,6 @@ SLOFILES=\ $(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 ---------------------------------- .INCLUDE : target.mk diff --git a/unotools/source/i18n/makefile.mk b/unotools/source/i18n/makefile.mk index bf5144a7700c..32c6cd3bcf31 100644 --- a/unotools/source/i18n/makefile.mk +++ b/unotools/source/i18n/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: jp $ $Date: 2000-12-21 09:26:35 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:20:42 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -103,14 +103,6 @@ SLOFILES= \ $(SLO)$/transliterationwrapper.obj \ $(SLO)$/textsearch.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)$/staticmbi18n.obj -.ENDIF - # --- Targets ---------------------------------- .INCLUDE : target.mk diff --git a/unotools/source/misc/makefile.mk b/unotools/source/misc/makefile.mk index 7b3368b494e5..b9b4d7a47e59 100644 --- a/unotools/source/misc/makefile.mk +++ b/unotools/source/misc/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:49 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:20:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -100,12 +100,6 @@ UNOUCROUT=$(OUT)$/inc SLOFILES= $(SLO)$/atom.obj \ $(SLO)$/datetime.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" -SLOFILES+=$(SLO)$/staticmbatom.obj -.ENDIF - - # --- Targets ---------------------------------- .INCLUDE : target.mk diff --git a/unotools/source/streaming/makefile.mk b/unotools/source/streaming/makefile.mk index d3a0c0bcc2bd..f934f6dfc7cb 100644 --- a/unotools/source/streaming/makefile.mk +++ b/unotools/source/streaming/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2000-11-07 09:47:31 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:20:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -96,15 +96,6 @@ ENABLE_EXCEPTIONS=TRUE SLOFILES= $(SLO)$/streamhelper.obj \ $(SLO)$/streamwrap.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 ---------------------------------- .INCLUDE : target.mk diff --git a/unotools/source/ucbhelper/makefile.mk b/unotools/source/ucbhelper/makefile.mk index 7c7347f48266..16c7a0e329c7 100644 --- a/unotools/source/ucbhelper/makefile.mk +++ b/unotools/source/ucbhelper/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: mba $ $Date: 2001-01-17 13:55:23 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:20:59 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -99,15 +99,6 @@ SLOFILES=\ $(SLO)$/ucbstreamhelper.obj \ $(SLO)$/tempfile.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 -- cgit v1.2.3