diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-10 20:40:50 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-10 20:40:50 +0000 |
| commit | 6811a28620e8baf523f3b131cafa28222e6fea21 (patch) | |
| tree | 9e30c7f8873303657e0ddac1ea02299abc6ce4bf /stoc | |
| parent | f188ae888c9b2ba8fa8bb988822c8194b8eb7cc6 (diff) | |
Updates to synchronize library and symbol names with naming convention used to sal and cppuhelper projects
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/prj/d.lst | 3 | ||||
| -rw-r--r-- | stoc/source/cppumaker.mk | 14 | ||||
| -rw-r--r-- | stoc/test/makefile.mk | 11 |
3 files changed, 19 insertions, 9 deletions
diff --git a/stoc/prj/d.lst b/stoc/prj/d.lst index ae5dbff4a6de..9ac16392fd08 100644 --- a/stoc/prj/d.lst +++ b/stoc/prj/d.lst @@ -2,6 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\stoc ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\* @@ -23,3 +24,5 @@ mkdir: %_DEST%\inc%_EXT%\stoc ..\source\simpleregistry\simreg.xml %_DEST%\xml%_EXT%\simreg.xml ..\source\tdmanager\tdmgr.xml %_DEST%\xml%_EXT%\tdmgr.xml ..\source\typeconv\tcv.xml %_DEST%\xml%_EXT%\tcv.xml + +dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" diff --git a/stoc/source/cppumaker.mk b/stoc/source/cppumaker.mk index 79b24c4982a7..2fb19127f933 100644 --- a/stoc/source/cppumaker.mk +++ b/stoc/source/cppumaker.mk @@ -2,9 +2,9 @@ # # $RCSfile: cppumaker.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: dbo $ $Date: 2000-12-15 11:07:59 $ +# last change: $Author: pluby $ $Date: 2001-02-10 21:40:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,9 +75,9 @@ UNOUCROUT= $(OUT)$/inc$/light INCPRE+= $(OUT)$/inc$/light .ENDIF -.IF "$(COM)$(OS)" == "GCCMACOSX" -CFLAGS += -Dcomponent_getImplementationEnvironment=$(TARGET)component_getImplementationEnvironment \ - -Dcomponent_writeInfo=$(TARGET)component_writeInfo \ - -Dcomponent_getFactory=$(TARGET)component_getFactory \ - -Dcomponent_getDescriptionFunc=$(TARGET)component_getDescriptionFunc +.IF "$(OS)" == "MACOSX" +CFLAGS += -Dcomponent_getImplementationEnvironment=lib$(TARGET)component_getImplementationEnvironment \ + -Dcomponent_writeInfo=lib$(TARGET)component_writeInfo \ + -Dcomponent_getFactory=lib$(TARGET)component_getFactory \ + -Dcomponent_getDescriptionFunc=lib$(TARGET)component_getDescriptionFunc .ENDIF diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk index 837f3ec98084..befa7a76c9de 100644 --- a/stoc/test/makefile.mk +++ b/stoc/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: dbo $ $Date: 2000-11-15 17:54:31 $ +# last change: $Author: pluby $ $Date: 2001-02-10 21:40:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -148,6 +148,13 @@ APP4STDLIBS= \ APP4STDLIBS+= $(LIBCIMT) .ENDIF +# 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" +APP4OBJS+=$(OBJ)$/staticmbtest.obj +.ENDIF + # --- Application 5 - testinvocation main ------------------------------------ APP5TARGET= $(TARGET5) APP5OBJS = $(OBJ)$/testiadapter.obj |