diff options
| -rw-r--r-- | cppu/test/makefile.mk | 17 | ||||
| -rw-r--r-- | cppuhelper/source/makefile.mk | 13 | ||||
| -rw-r--r-- | cppuhelper/test/makefile.mk | 13 | ||||
| -rw-r--r-- | stoc/source/invocation_adapterfactory/makefile.mk | 13 | ||||
| -rw-r--r-- | stoc/test/makefile.mk | 14 |
5 files changed, 11 insertions, 59 deletions
diff --git a/cppu/test/makefile.mk b/cppu/test/makefile.mk index 7afd84278dfa..d7fdab45af0c 100644 --- a/cppu/test/makefile.mk +++ b/cppu/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: pluby $ $Date: 2001-02-13 02:49:09 $ +# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,25 +87,14 @@ OBJFILES= \ # $(OBJ)$/test_Cincludes.obj # $(OBJ)$/test_sec.obj \ -# gcc on Mac OS X optimizes out some temporary variables when optimization is -# turned on for compiling -.IF "$(OS)"=="MACOSX" -NOOPTFILES+=$(OBJFILES) -.IF "$(NOOPT_FLAG)"!="" -CFLAGSNOOPT= -.ENDIF -.ENDIF - APP1TARGET= testcppu APP1OBJS= \ $(OBJ)$/testcppu.obj \ $(OBJ)$/test_di.obj # $(OBJ)$/test_sec.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" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" APP1OBJS+=$(OBJ)$/staticmbtest.obj .ENDIF diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index 09356dd2e8e7..7593b61c57e6 100644 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 15:26:49 $ +# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -127,15 +127,6 @@ SLOFILES= \ $(SLO)$/component.obj \ $(SLO)$/shlib.obj -# gcc on Mac OS X optimizes out some temporary variables when optimization is -# turned on for compiling -.IF "$(OS)"=="MACOSX" -NOOPTFILES+=$(SLOFILES) -.IF "$(NOOPT_FLAG)"!="" -CFLAGSNOOPT= -.ENDIF -.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 diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk index edd9df63ef68..345f04b414ba 100644 --- a/cppuhelper/test/makefile.mk +++ b/cppuhelper/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-13 20:55:24 $ +# last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,15 +89,6 @@ OBJFILES= \ $(OBJ)$/testimplhelper.obj \ $(OBJ)$/testcontainer.obj -# gcc on Mac OS X optimizes out some temporary variables when optimization is -# turned on for compiling -.IF "$(OS)"=="MACOSX" -NOOPTFILES+=$(OBJFILES) -.IF "$(NOOPT_FLAG)"!="" -CFLAGSNOOPT= -.ENDIF -.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" OBJFILES+=$(OBJ)$/staticmbtest.obj diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk index c2345d4e8e60..c4838465e076 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.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-15 01:51:12 $ +# last change: $Author: pluby $ $Date: 2001-02-17 09:23:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,15 +79,6 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/iafactory.obj -# gcc on Mac OS X optimizes out some temporary variables when optimization is -# turned on for compiling -.IF "$(OS)"=="MACOSX" -NOOPTFILES+=$(SLOFILES) -.IF "$(NOOPT_FLAG)"!="" -CFLAGSNOOPT= -.ENDIF -.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)$/staticmbinvocation_adapterfactory.obj diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk index 2da0e98595a8..236b36a90fcd 100644 --- a/stoc/test/makefile.mk +++ b/stoc/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: pluby $ $Date: 2001-02-13 02:56:15 $ +# last change: $Author: pluby $ $Date: 2001-02-17 09:23:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -217,16 +217,6 @@ APP8STDLIBS+= $(LIBCIMT) APP8OBJS+=$(OBJ)$/staticmbtest.obj .ENDIF -# gcc on Mac OS X optimizes out some temporary variables when optimization is -# turned on for compiling -.IF "$(OS)"=="MACOSX" -NOOPTFILES+=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) \ - $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) -.IF "$(NOOPT_FLAG)"!="" -CFLAGSNOOPT= -.ENDIF -.ENDIF - ALLIDLFILES:= testcorefl.idl language_binding.idl testintrosp.idl |