diff options
| -rw-r--r-- | bridges/source/remote/context/makefile.mk | 15 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 16 | ||||
| -rw-r--r-- | registry/util/makefile.mk | 16 | ||||
| -rw-r--r-- | store/util/makefile.mk | 17 |
4 files changed, 30 insertions, 34 deletions
diff --git a/bridges/source/remote/context/makefile.mk b/bridges/source/remote/context/makefile.mk index 08a03415b704..d95604ba2d29 100644 --- a/bridges/source/remote/context/makefile.mk +++ b/bridges/source/remote/context/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: jbu $ $Date: 2001-05-02 15:00:10 $ +# last change: $Author: jsc $ $Date: 2001-05-04 13:40:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,11 +67,10 @@ TARGET=rmcxt ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE +UNIXVERSIONNAMES=UDK + # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk -.INCLUDE : $(PRJ)$/version.mk # ------------------------------------------------------------------ UNOUCRDEP=$(SOLARUCRDIR)$/uce.rdb @@ -79,7 +78,7 @@ UNOUCRRDB=$(SOLARUCRDIR)$/uce.rdb SLOFILES= $(SLO)$/context.obj -SHL1TARGET= $(RMCXT_TARGET)$(RMCXT_MAJOR) +SHL1TARGET= $(TARGET) SHL1STDLIBS= \ $(SALLIB) @@ -89,8 +88,10 @@ SHL1IMPLIB= i$(TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1VERSIONMAP= $(TARGET).map + DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp +#DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------ diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 027f1ed04401..2ff3abb50228 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/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:25:54 $ +# last change: $Author: jsc $ $Date: 2001-05-04 13:35:39 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,12 +67,10 @@ USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE +UNIXVERSIONNAMES=UDK + # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk - -.INCLUDE : ..$/version.mk # --- Files -------------------------------------------------------- @@ -81,7 +79,7 @@ SHL1LIBS= \ $(SLB)$/cppu_uno.lib \ $(SLB)$/cppu_threadpool.lib -SHL1TARGET= $(CPPU_TARGET)$(CPPU_MAJOR) +SHL1TARGET= $(TARGET) SHL1STDLIBS= $(SALLIB) @@ -89,8 +87,10 @@ SHL1DEPN= SHL1IMPLIB= i$(TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1VERSIONMAP= $(TARGET).map + DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp +#DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------ diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk index 44dc8240d438..c0c92b3477f6 100644 --- a/registry/util/makefile.mk +++ b/registry/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: jsc $ $Date: 2001-03-14 10:02:24 $ +# last change: $Author: jsc $ $Date: 2001-05-04 13:32:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -65,13 +65,10 @@ PRJ=.. PRJNAME=registry TARGET=reg -# --- Settings ----------------------------------------------------- +UNIXVERSIONNAMES=UDK -.INCLUDE : svpre.mk +# --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : sv.mk - -.INCLUDE : ..$/version.mk # ------------------------------------------------------------------ @@ -90,7 +87,7 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1FILES= $(SLB)$/$(TARGET)cpp.lib -SHL1TARGET= $(REGISTRY_TARGET)$(REGISTRY_MAJOR) +SHL1TARGET= $(TARGET) SHL1IMPLIB= ireg SHL1STDLIBS= \ $(SALLIB) \ @@ -98,12 +95,13 @@ SHL1STDLIBS= \ $(STORELIB) \ $(LIBCIMT) +SHL1VERSIONMAP= $(TARGET).map SHL1LIBS= $(LIB1TARGET) SHL1DEPN= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp +#DEF1EXPORTFILE= exports.dxp DEF1DES = RegistryRuntime # --- Targets ------------------------------------------------------ diff --git a/store/util/makefile.mk b/store/util/makefile.mk index edd7d8ac719e..2a0f9966c611 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: mhu $ $Date: 2001-03-13 21:07:32 $ +# last change: $Author: jsc $ $Date: 2001-05-04 13:28:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -63,19 +63,16 @@ PRJ=.. PRJNAME=store -TARGET=sto +TARGET=store TARGETTYPE=CUI USE_LDUMP2=TRUE USE_DEFFILE=TRUE -# --- Settings --- +UNIXVERSIONNAMES=UDK -.INCLUDE : svpre.mk +# --- Settings --- .INCLUDE : settings.mk -.INCLUDE : sv.mk - -.INCLUDE : ..$/version.mk # --- Debug-Library --- @@ -89,7 +86,7 @@ LIB1FILES= $(LB)$/store.lib # --- Shared-Library --- -SHL1TARGET= $(STORE_TARGET)$(STORE_MAJOR) +SHL1TARGET= $(TARGET) SHL1IMPLIB= istore .IF "$(OS)"=="MACOSX" #SHL1VERSIONMAP= $(TARGET).$(DLLPOSTFIX).map @@ -106,7 +103,7 @@ SHL1LIBS= $(SLB)$/store.lib # --- Def-File --- DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= $(TARGET).dxp +#DEF1EXPORTFILE= $(TARGET).dxp DEF1DES=Store # --- Targets --- |