Kaydet (Commit) 83f0fcea authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS uno2 (1.2.42); FILE MERGED

2003/04/08 13:58:21 dbo 1.2.42.1: #107991# UNO shared library component renaming
üst a8b8e715
...@@ -2,9 +2,9 @@ PRJ=..$/.. ...@@ -2,9 +2,9 @@ PRJ=..$/..
PRJNAME=testtools PRJNAME=testtools
TARGET=performancetest TARGET=performancetest
USE_DEFFILE=TRUE
NO_BSYMBOLIC=TRUE NO_BSYMBOLIC=TRUE
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
LIBTARGET=NO LIBTARGET=NO
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
...@@ -40,17 +40,16 @@ UNOTYPES= \ ...@@ -40,17 +40,16 @@ UNOTYPES= \
com.sun.star.lang.XSingleComponentFactory \ com.sun.star.lang.XSingleComponentFactory \
com.sun.star.uno.XComponentContext com.sun.star.uno.XComponentContext
SLOFILES= \
$(SLO)$/ubtest.obj \
$(SLO)$/ubobject.obj
# ---- test ---- # ---- test ----
LIB1TARGET=$(SLB)$/perftest.lib LIB1TARGET=$(SLB)$/perftest.lib
LIB1OBJFILES= \ LIB1OBJFILES= \
$(SLO)$/ubtest.obj $(SLO)$/ubtest.obj
SHL1TARGET=perftest SHL1TARGET = perftest.uno
SHL1VERSIONMAP = $(SOLARENV)$/src$/component.map
SHL1STDLIBS= \ SHL1STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
...@@ -59,7 +58,6 @@ SHL1STDLIBS= \ ...@@ -59,7 +58,6 @@ SHL1STDLIBS= \
SHL1LIBS= $(LIB1TARGET) SHL1LIBS= $(LIB1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET) DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
# ---- test object ---- # ---- test object ----
...@@ -67,7 +65,10 @@ LIB2TARGET=$(SLB)$/perfobj.lib ...@@ -67,7 +65,10 @@ LIB2TARGET=$(SLB)$/perfobj.lib
LIB2OBJFILES= \ LIB2OBJFILES= \
$(SLO)$/ubobject.obj $(SLO)$/ubobject.obj
SHL2TARGET=perfobj SHL2TARGET = perfobj.uno
SHL2VERSIONMAP = $(SOLARENV)$/src$/component.map
SHL2STDLIBS= \ SHL2STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
...@@ -76,7 +77,6 @@ SHL2STDLIBS= \ ...@@ -76,7 +77,6 @@ SHL2STDLIBS= \
SHL2LIBS= $(LIB2TARGET) SHL2LIBS= $(LIB2TARGET)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET) DEF2NAME= $(SHL2TARGET)
DEF2EXPORTFILE= exports.dxp
# ---- pseudo uno bridge ---- # ---- pseudo uno bridge ----
...@@ -85,6 +85,9 @@ LIB3OBJFILES= \ ...@@ -85,6 +85,9 @@ LIB3OBJFILES= \
$(SLO)$/pseudo.obj $(SLO)$/pseudo.obj
SHL3TARGET=pseudo_uno_uno SHL3TARGET=pseudo_uno_uno
SHL3VERSIONMAP = pseudo_uno_uno.map
SHL3STDLIBS= \ SHL3STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(SALLIB) $(SALLIB)
...@@ -92,7 +95,6 @@ SHL3STDLIBS= \ ...@@ -92,7 +95,6 @@ SHL3STDLIBS= \
SHL3LIBS= $(LIB3TARGET) SHL3LIBS= $(LIB3TARGET)
SHL3DEF= $(MISC)$/$(SHL3TARGET).def SHL3DEF= $(MISC)$/$(SHL3TARGET).def
DEF3NAME= $(SHL3TARGET) DEF3NAME= $(SHL3TARGET)
DEF3EXPORTFILE= pseudo.dxp
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment