diff options
32 files changed, 64 insertions, 244 deletions
diff --git a/bridges/source/remote/urp/makefile.mk b/bridges/source/remote/urp/makefile.mk index b0a592675b71..a546c15c2317 100644 --- a/bridges/source/remote/urp/makefile.mk +++ b/bridges/source/remote/urp/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 18:27:25 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:12:54 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -114,11 +114,6 @@ NOOPTFILES= \ $(SLO)$/urp_reader.obj .ENDIF # "$(COM)"=="GCC" -# 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)$/staticmbremoteurp.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS=\ diff --git a/cppu/test/makefile.mk b/cppu/test/makefile.mk index d7fdab45af0c..4f0bd8db3f4c 100644 --- a/cppu/test/makefile.mk +++ b/cppu/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:14:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -93,11 +93,6 @@ APP1OBJS= \ $(OBJ)$/test_di.obj # $(OBJ)$/test_sec.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)$/staticmbtest.obj -.ENDIF - APP1STDLIBS+= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index 7593b61c57e6..ce53c27a5fa1 100644 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:14:11 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -127,11 +127,6 @@ SLOFILES= \ $(SLO)$/component.obj \ $(SLO)$/shlib.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)$/staticmb.obj -.ENDIF - SHL1TARGET= $(TARGET)$(CPPUHELPER_MAJOR)$(COM) SHL1STDLIBS= \ diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk index 345f04b414ba..8b85f38f05b5 100644 --- a/cppuhelper/test/makefile.mk +++ b/cppuhelper/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:14:15 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,11 +89,6 @@ OBJFILES= \ $(OBJ)$/testimplhelper.obj \ $(OBJ)$/testcontainer.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" -OBJFILES+=$(OBJ)$/staticmbtest.obj -.ENDIF - APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk index 2310a5612eba..9cf7af809694 100644 --- a/cpputools/source/unoexe/makefile.mk +++ b/cpputools/source/unoexe/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 17:34:02 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:14:18 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -107,11 +107,6 @@ CXXFILES= \ APP1TARGET=$(TARGET) APP1OBJS=$(OBJ)$/unoexe.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)$/staticmb.obj -.ENDIF - APP1STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk index fa048bbfe876..77d8fb49229a 100644 --- a/io/source/TextInputStream/makefile.mk +++ b/io/source/TextInputStream/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2000-11-13 15:51:33 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:15:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,12 +89,6 @@ UNOTYPES= com.sun.star.io.XTextInputStream \ SLOFILES= \ $(SLO)$/TextInputStream.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)$/staticmbTextInputStream.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk index e01dfc240e1d..06c3294c0b84 100644 --- a/io/source/TextOutputStream/makefile.mk +++ b/io/source/TextOutputStream/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2000-11-13 15:52:21 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:15:33 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -88,12 +88,6 @@ UNOTYPES= com.sun.star.io.XTextOutputStream \ SLOFILES= \ $(SLO)$/TextOutputStream.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)$/staticmbTextOutputStream.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index 21021ff4ac87..76ea9cc162de 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 17:02:45 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:15:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,12 +86,6 @@ SLOFILES= \ $(SLO)$/acc_pipe.obj \ $(SLO)$/acc_socket.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)$/staticmbacceptor.obj -.ENDIF - - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk index 9d1d85a01b71..19db2ec7ecc6 100644 --- a/io/source/connector/makefile.mk +++ b/io/source/connector/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 17:12:03 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:15:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,11 +86,6 @@ SLOFILES= \ $(SLO)$/ctr_pipe.obj\ $(SLO)$/ctr_socket.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)$/staticmbconnector.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk index e2cd7c4f4dc2..cef1ffeb2f8e 100644 --- a/io/source/stm/makefile.mk +++ b/io/source/stm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 17:14:07 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:15:46 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,11 +86,6 @@ SLOFILES = $(SLO)$/opipe.obj\ $(SLO)$/streamhelper.obj \ $(SLO)$/opump.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)$/staticmbstm.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk index be8b449b3598..c4462d59118f 100644 --- a/javaunohelper/source/makefile.mk +++ b/javaunohelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 19:38:15 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:15:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -105,11 +105,6 @@ UNOTYPES= \ SLOFILES= \ $(SLO)$/javaunohelper.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)$/staticmb.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ 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) \ diff --git a/remotebridges/source/dynamicloader/makefile.mk b/remotebridges/source/dynamicloader/makefile.mk index 2d8e73ebe118..1735dbd9ec39 100755 --- a/remotebridges/source/dynamicloader/makefile.mk +++ b/remotebridges/source/dynamicloader/makefile.mk @@ -3,8 +3,8 @@ #* $Workfile: makefile $ #* #* Ersterstellung JSC 24.06.99 -#* Letzte Aenderung $Author: pluby $ $Date: 2001-02-12 01:33:28 $ -#* $Revision: 1.4 $ +#* Letzte Aenderung $Author: pluby $ $Date: 2001-03-02 07:16:26 $ +#* $Revision: 1.5 $ #* #* $Logfile:$ #* @@ -41,11 +41,6 @@ INCPRE+=$(UNOUCROUT) SLOFILES= \ $(SLO)$/dynamicloader.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)$/staticmbdynamic.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS=\ diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk index 1e707d423315..b613b5336d52 100644 --- a/remotebridges/source/factory/makefile.mk +++ b/remotebridges/source/factory/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:30 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:16:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,11 +81,6 @@ SLOFILES= \ $(SLO)$/bridgefactory.obj\ $(SLO)$/bridgeimpl.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)$/staticmbfactory.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk index c6ca211519d5..8a6efcbe0e9d 100644 --- a/remotebridges/source/unourl_resolver/makefile.mk +++ b/remotebridges/source/unourl_resolver/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 19:51:56 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:16:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,11 +98,6 @@ UNOTYPES= \ SLOFILES= \ $(SLO)$/unourl_resolver.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)$/staticmb.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk index 694e90cb7dd6..57cd62a34424 100644 --- a/stoc/source/corereflection/makefile.mk +++ b/stoc/source/corereflection/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 03:52:41 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,11 +84,6 @@ SLOFILES= \ $(SLO)$/criface.obj \ $(SLO)$/crenum.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)$/staticmbcorereflection.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/defaultregistry/makefile.mk b/stoc/source/defaultregistry/makefile.mk index f89c0e867edc..475e11917d4b 100644 --- a/stoc/source/defaultregistry/makefile.mk +++ b/stoc/source/defaultregistry/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:32 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,11 +81,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/defaultregistry.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)$/staticmbdefaultregistry.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/implementationregistration/makefile.mk b/stoc/source/implementationregistration/makefile.mk index f3cc19eea16c..c56efaff917e 100644 --- a/stoc/source/implementationregistration/makefile.mk +++ b/stoc/source/implementationregistration/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:34 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:19 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,11 +80,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/implreg.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)$/staticmbimplementationregistration.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk index 7a2b78a40755..775c4563f661 100644 --- a/stoc/source/inspect/makefile.mk +++ b/stoc/source/inspect/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:26:41 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,10 +78,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/introspection.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)$/staticmbinspect.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk index f1882bfdef16..c11668ba4102 100644 --- a/stoc/source/invocation/makefile.mk +++ b/stoc/source/invocation/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 03:52:43 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,11 +79,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/invocation.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)$/staticmbinvocation.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk index c4838465e076..91389bd8a7cb 100644 --- a/stoc/source/invocation_adapterfactory/makefile.mk +++ b/stoc/source/invocation_adapterfactory/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: pluby $ $Date: 2001-02-17 09:23:01 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,11 +79,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/iafactory.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)$/staticmbinvocation_adapterfactory.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk index 08aca51c2bc1..26d0aedde74b 100644 --- a/stoc/source/javaloader/makefile.mk +++ b/stoc/source/javaloader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:35 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:41 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -101,11 +101,6 @@ UNOTYPES= \ SLOFILES= $(SLO)$/javaloader.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)$/staticmbjavaloader.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS=\ diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index 44686a29ef40..8714b5bde95f 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: obo $ $Date: 2000-12-21 13:24:08 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,13 +87,6 @@ SLOFILES= \ $(SLO)$/javavm.obj \ $(SLO)$/jvmargs.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)$/staticmbjavavm.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/loader/makefile.mk b/stoc/source/loader/makefile.mk index fffc135bfdf0..79a890ef6238 100644 --- a/stoc/source/loader/makefile.mk +++ b/stoc/source/loader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:14:51 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:49 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,12 +80,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/dllcomponentloader.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)$/staticmbloader.obj -.ENDIF - - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk index c9900b50edc4..81d5cc017f8d 100644 --- a/stoc/source/namingservice/makefile.mk +++ b/stoc/source/namingservice/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:15:44 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,10 +78,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/namingservice.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)$/staticmbnamingservice.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk index 6c8d0605de24..4e8c962bdc27 100644 --- a/stoc/source/proxy_factory/makefile.mk +++ b/stoc/source/proxy_factory/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:16:52 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:18:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,10 +80,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/proxyfac.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)$/staticmbproxy_factory.obj -.ENDIF SHL1TARGET=$(TARGET) diff --git a/stoc/source/registry_tdprovider/makefile.mk b/stoc/source/registry_tdprovider/makefile.mk index 21187c13dfad..d066ace221f7 100644 --- a/stoc/source/registry_tdprovider/makefile.mk +++ b/stoc/source/registry_tdprovider/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 03:52:46 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:19:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,10 +84,6 @@ SLOFILES= \ $(SLO)$/tdcomp.obj \ $(SLO)$/tdiface.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)$/staticmbregistry_tdprovider.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/stoc/source/servicemanager/makefile.mk b/stoc/source/servicemanager/makefile.mk index 9d942996c104..dbb0e4f95705 100644 --- a/stoc/source/servicemanager/makefile.mk +++ b/stoc/source/servicemanager/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:38 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:19:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,11 +80,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/servicemanager.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)$/staticmbservicemanager.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/simpleregistry/makefile.mk b/stoc/source/simpleregistry/makefile.mk index 577e24f3960f..9e0908cb9d30 100644 --- a/stoc/source/simpleregistry/makefile.mk +++ b/stoc/source/simpleregistry/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:40 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:19:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,11 +80,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/simpleregistry.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)$/staticmbsimpleregistry.obj -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/stoc/source/tdmanager/makefile.mk b/stoc/source/tdmanager/makefile.mk index 69954cd4bee1..bd60cb824aa5 100644 --- a/stoc/source/tdmanager/makefile.mk +++ b/stoc/source/tdmanager/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:24:26 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:19:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,10 +80,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/tdmgr.obj \ $(SLO)$/transfer.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)$/staticmbtdmanager.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/stoc/source/typeconv/makefile.mk b/stoc/source/typeconv/makefile.mk index 74f589ce5a61..03a4be029b35 100644 --- a/stoc/source/typeconv/makefile.mk +++ b/stoc/source/typeconv/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:25:06 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:19:18 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,10 +78,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/convert.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)$/staticmbtypeconv.obj -.ENDIF SHL1TARGET= $(TARGET) diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk index 236b36a90fcd..28e1d2ccc56e 100644 --- a/stoc/test/makefile.mk +++ b/stoc/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: pluby $ $Date: 2001-02-17 09:23:01 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:17:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -148,11 +148,6 @@ APP4STDLIBS= \ APP4STDLIBS+= $(LIBCIMT) .ENDIF -# 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" -APP4OBJS+=$(OBJ)$/staticmbtest.obj -.ENDIF - # --- Application 5 - testinvocation main ------------------------------------ APP5TARGET= $(TARGET5) APP5OBJS = $(OBJ)$/testiadapter.obj @@ -165,11 +160,6 @@ APP5STDLIBS= \ APP5STDLIBS+= $(LIBCIMT) .ENDIF -# 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" -APP5OBJS+=$(OBJ)$/staticmbtest.obj -.ENDIF - # --- Application 6 - testitrosp main ------------------------------------ APP6TARGET= $(TARGET6) APP6OBJS = $(OBJ)$/testintrosp.obj @@ -183,11 +173,6 @@ APP6STDLIBS= \ APP6STDLIBS+= $(LIBCIMT) .ENDIF -# 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" -APP6OBJS+=$(OBJ)$/staticmbtest.obj -.ENDIF - # --- Application 7 - testconv main ------------------------------------ APP7TARGET= $(TARGET7) APP7OBJS = $(OBJ)$/testconv.obj @@ -212,11 +197,6 @@ APP8STDLIBS= \ APP8STDLIBS+= $(LIBCIMT) .ENDIF -# 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" -APP8OBJS+=$(OBJ)$/staticmbtest.obj -.ENDIF - ALLIDLFILES:= testcorefl.idl language_binding.idl testintrosp.idl |