Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process
This commit is contained in:
parent
46f9afe549
commit
e2efb71af3
22 changed files with 44 additions and 186 deletions
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.3 $
|
||||
# $Revision: 1.4 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 17:30:19 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:13:05 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -77,11 +77,6 @@ SLOFILES=\
|
|||
$(SLO)$/enumhelper.obj \
|
||||
$(SLO)$/container.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)$/staticmbcontainer.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ----------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.3 $
|
||||
# $Revision: 1.4 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 17:30:20 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:13:10 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -103,11 +103,6 @@ ENABLE_EXCEPTIONS=TRUE
|
|||
|
||||
SLOFILES= $(SLO)$/eventattachermgr.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)$/staticmbeventattachermgr.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ----------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.4 $
|
||||
# $Revision: 1.5 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 17:30:20 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:13:15 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -80,11 +80,6 @@ SLOFILES= $(SLO)$/interaction.obj \
|
|||
$(SLO)$/querydeep.obj \
|
||||
$(SLO)$/regpathhelper.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)$/staticmbinteraction.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ----------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.4 $
|
||||
# $Revision: 1.5 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 17:30:21 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:13:20 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -80,11 +80,6 @@ SLOFILES= $(SLO)$/composedprops.obj \
|
|||
$(SLO)$/propstate.obj \
|
||||
$(SLO)$/propertycontainer.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)$/staticmbproperty.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ----------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.3 $
|
||||
# $Revision: 1.4 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 17:30:21 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:13:26 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -77,11 +77,6 @@ SLOFILES= $(SLO)$/basicio.obj \
|
|||
$(SLO)$/seqstream.obj \
|
||||
$(SLO)$/streamsection.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)$/staticmbstreaming.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ----------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.2 $
|
||||
# $Revision: 1.3 $
|
||||
#
|
||||
# last change: $Author: ganaya $ $Date: 2001-01-02 23:22:09 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:14:45 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -155,15 +155,6 @@ SLOFILES = $(SLO)$/cgm.obj \
|
|||
$(SLO)$/elements.obj
|
||||
# $(SLO)$/svdem.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 m ultiple defined symbols
|
||||
.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
|
||||
SLOFILES+=$(SLO)$/staticmbicgm.obj
|
||||
.ENDIF
|
||||
|
||||
|
||||
|
||||
SHL1TARGET = icg$(UPD)$(DLLPOSTFIX)
|
||||
SHL1IMPLIB = icgm
|
||||
SHL1DEPN = $(LB)$/icgm.lib
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.5 $
|
||||
# $Revision: 1.6 $
|
||||
#
|
||||
# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:16:52 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -83,11 +83,6 @@ SLOFILES =\
|
|||
SYMBOLPREFIX=sax
|
||||
.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"
|
||||
SLOFILES+=$(SLO)$/staticmb.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
.INCLUDE : target.mk
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.2 $
|
||||
# $Revision: 1.3 $
|
||||
#
|
||||
# last change: $Author: pluby $ $Date: 2001-02-15 01:11:31 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:16:46 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -94,11 +94,6 @@ APP2STDLIBS = $(SALLIB) \
|
|||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB)
|
||||
|
||||
# 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"
|
||||
APP2OBJS+=$(OBJ)$/staticmbtest.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.2 $
|
||||
# $Revision: 1.3 $
|
||||
#
|
||||
# last change: $Author: pluby $ $Date: 2001-02-15 01:11:32 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:16:43 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -76,11 +76,6 @@ ENABLE_EXCEPTIONS=TRUE
|
|||
SLOFILES = $(SLO)$/testsax.obj \
|
||||
$(SLO)$/testwriter.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)$/staticmbtestsax.obj
|
||||
.ENDIF
|
||||
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1IMPLIB= i$(TARGET)
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.20 $
|
||||
# $Revision: 1.21 $
|
||||
#
|
||||
# last change: $Author: tl $ $Date: 2001-02-19 10:59:28 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:19:21 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -95,13 +95,6 @@ SLOFILES = \
|
|||
$(SLO)$/defaultoptions.obj \
|
||||
$(SLO)$/searchopt.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
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.4 $
|
||||
# $Revision: 1.5 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 18:46:27 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:19:23 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -116,11 +116,6 @@ EXCEPTIONSFILES= \
|
|||
$(SLO)$/numfmuno.obj \
|
||||
$(SLO)$/supservs.obj
|
||||
|
||||
# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symb ols
|
||||
.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
|
||||
SLOFILES+=$(SLO)$/staticmbnumbers.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets -------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.8 $
|
||||
# $Revision: 1.9 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 18:45:40 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:19:27 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -254,12 +254,6 @@ LIB1OBJFILES= \
|
|||
$(SLO)$/unoiface.obj \
|
||||
$(SLO)$/imgprod.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)$/staticmbuno.obj
|
||||
LIB1OBJFILES+=$(SLO)$/staticmbuno.obj
|
||||
.ENDIF
|
||||
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.3 $
|
||||
# $Revision: 1.4 $
|
||||
#
|
||||
# last change: $Author: svesik $ $Date: 2001-02-02 18:21:41 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:19:31 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -91,11 +91,6 @@ SLOFILES= \
|
|||
$(SLO)$/vclxwindow.obj \
|
||||
$(SLO)$/vclxwindows.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)$/staticmbawt.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.5 $
|
||||
# $Revision: 1.6 $
|
||||
#
|
||||
# last change: $Author: ab $ $Date: 2001-02-21 17:37:21 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:19:37 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -87,11 +87,6 @@ SLOFILES= \
|
|||
$(SLO)$/unocontrolmodel.obj \
|
||||
$(SLO)$/unocontrols.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)$/staticmbcontrols.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.5 $
|
||||
# $Revision: 1.6 $
|
||||
#
|
||||
# last change: $Author: kso $ $Date: 2001-02-05 15:52:01 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:20:22 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -87,13 +87,6 @@ SLOFILES=\
|
|||
|
||||
.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"
|
||||
SLOFILES+=$(SLO)$/staticmbclient.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.7 $
|
||||
# $Revision: 1.8 $
|
||||
#
|
||||
# last change: $Author: kso $ $Date: 2001-02-12 11:56:23 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:20:29 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -95,13 +95,6 @@ SLOFILES=\
|
|||
|
||||
.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"
|
||||
SLOFILES+=$(SLO)$/staticmbprovider.obj
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.6 $
|
||||
# $Revision: 1.7 $
|
||||
#
|
||||
# last change: $Author: pluby $ $Date: 2001-02-12 01:33:45 $
|
||||
# last change: $Author: pluby $ $Date: 2001-03-02 07:21:11 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -98,11 +98,6 @@ SLOFILES= $(SLO)$/acceptor.obj \
|
|||
$(SLO)$/xception.obj \
|
||||
$(SLO)$/evtque.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
|
||||
|
||||
# $(SLO)$/evtque.obj
|
||||
|
||||
.IF "$(GUI)"=="WIN"
|
||||
|
@ -137,11 +132,6 @@ OBJFILES= $(OBJ)$/acceptor.obj \
|
|||
$(OBJ)$/xception.obj \
|
||||
$(OBJ)$/evtque.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)$/staticmb.obj
|
||||
.ENDIF
|
||||
|
||||
# $(SLO)$/evtque.obj
|
||||
.ENDIF
|
||||
|
||||
|
|
Loading…
Reference in a new issue