diff options
-rw-r--r-- | io/source/acceptor/makefile.mk | 9 | ||||
-rw-r--r-- | io/source/connector/makefile.mk | 9 | ||||
-rw-r--r-- | io/source/stm/makefile.mk | 9 | ||||
-rw-r--r-- | remotebridges/source/bridge/makefile.mk | 9 | ||||
-rw-r--r-- | remotebridges/source/factory/makefile.mk | 9 | ||||
-rw-r--r-- | remotebridges/source/unourl_resolver/makefile.mk | 8 |
6 files changed, 21 insertions, 32 deletions
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index fea8a1268482..0f46d30d51c9 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:29 $ +# last change: $Author: jbu $ $Date: 2000-10-31 15:56:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,13 +80,12 @@ UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc$/acceptor INCPRE+= $(UNOUCROUT) -UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/acceptor.obj \ $(SLO)$/acc_pipe.obj \ - $(SLO)$/acc_socket.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj + $(SLO)$/acc_socket.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 diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk index d87583d16276..116750f9b471 100644 --- a/io/source/connector/makefile.mk +++ b/io/source/connector/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:29 $ +# last change: $Author: jbu $ $Date: 2000-10-31 15:56:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,14 +80,13 @@ UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc$/connector INCPRE+= $(UNOUCROUT) -UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/connector.obj\ $(SLO)$/ctr_pipe.obj\ $(SLO)$/ctr_socket.obj\ - $(SLO)$/ctr_channel.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj + $(SLO)$/ctr_channel.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 diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk index 96dac9b9296b..a76e79093266 100644 --- a/io/source/stm/makefile.mk +++ b/io/source/stm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: jbu $ $Date: 2000-10-16 12:22:47 $ +# last change: $Author: jbu $ $Date: 2000-10-31 15:58:28 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,15 +78,14 @@ UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc$/stm INCPRE+= $(UNOUCROUT) -UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES = $(SLO)$/opipe.obj\ $(SLO)$/factreg.obj\ $(SLO)$/omark.obj\ $(SLO)$/odata.obj \ $(SLO)$/streamhelper.obj \ - $(SLO)$/opump.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj + $(SLO)$/opump.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 diff --git a/remotebridges/source/bridge/makefile.mk b/remotebridges/source/bridge/makefile.mk index 8d3b5887e53a..393d4002c5ae 100644 --- a/remotebridges/source/bridge/makefile.mk +++ b/remotebridges/source/bridge/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: jbu $ $Date: 2000-09-28 08:47:31 $ +# last change: $Author: jbu $ $Date: 2000-10-31 15:54:16 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,15 +77,12 @@ UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc$/bridge INCPRE+= $(UNOUCROUT) -UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/remote_bridge.obj \ $(SLO)$/bridge_connection.obj\ - $(SLO)$/bridge_provider.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj - + $(SLO)$/bridge_provider.obj SHL1TARGET= $(TARGET) SHL1STDLIBS= \ diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk index 1101522fab67..c25de41f07c2 100644 --- a/remotebridges/source/factory/makefile.mk +++ b/remotebridges/source/factory/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 15:29:56 $ +# last change: $Author: jbu $ $Date: 2000-10-31 15:53:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,13 +78,10 @@ UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc$/factory INCPRE+= $(UNOUCROUT) -UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/bridgefactory.obj\ - $(SLO)$/bridgeimpl.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj - + $(SLO)$/bridgeimpl.obj SHL1TARGET= $(TARGET) diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk index 8c6815c3027e..0851ecf3ce00 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.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 15:29:57 $ +# last change: $Author: jbu $ $Date: 2000-10-31 15:53:20 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,7 +79,6 @@ UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc$/uuresolver INCPRE+= $(UNOUCROUT) -UNOTYPES=$($(TARGET)_XML2CMPTYPES) UNOTYPES= \ @@ -97,8 +96,7 @@ UNOTYPES= \ com.sun.star.uno.XWeak SLOFILES= \ - $(SLO)$/unourl_resolver.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj + $(SLO)$/unourl_resolver.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. |