diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-13 17:58:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-13 17:58:55 +0000 |
| commit | 76d52b7463ad6b5aab90c54fb565dcb274f8693e (patch) | |
| tree | 94df1eac97ded8616e2871439baab4bfa089f780 /stoc | |
| parent | 268c606ec70f1110a78c16420b31fba80a8aa81e (diff) | |
INTEGRATION: CWS cd02 (1.22.40); FILE MERGED
2004/11/15 17:29:00 dbo 1.22.40.1: #i24030# general cleanup to make buildable again
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/test/makefile.mk | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk index b52af5917b8d..d5dfab0dceda 100644 --- a/stoc/test/makefile.mk +++ b/stoc/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: kz $ $Date: 2004-03-25 14:49:42 $ +# last change: $Author: kz $ $Date: 2005-01-13 18:58:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,7 +73,7 @@ TARGET7=testconv TARGET8=testproxyfac TARGET9=testsmgr2 TARGETTYPE=CUI -LIBTARGET=NO +#LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE @@ -83,6 +83,24 @@ NO_BSYMBOLIC=TRUE .INCLUDE : settings.mk .INCLUDE : sv.mk +# --- smgr component ----------------------------------------------- +SHL1OBJS= \ + $(OBJ)$/testsmgr_cpnt.obj + +SHL1STDLIBS= \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALHELPERLIB) \ + $(SALLIB) + +SHL1TARGET=testsmgr_component +SHL1DEPN= +SHL1IMPLIB=i$(SHL1TARGET) +#SHL1LIBS=$(SLB)$/$(SHL1TARGET).lib +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) +SHL1VERSIONMAP=testsmgr_cpnt.map + # --- Application 1 ------------------------------------------------ APP1TARGET= $(TARGET1) APP1OBJS= $(OBJ)$/testloader.obj @@ -100,7 +118,7 @@ APP1STDLIBS+= # --- Application 2 ------------------------------------------------ APP2TARGET= $(TARGET2) -APP2OBJS= $(OBJ)$/testregistry.obj $(OBJ)$/mergekeys.obj +APP2OBJS= $(OBJ)$/testregistry.obj $(OBJ)$/mergekeys_.obj APP2STDLIBS= \ $(CPPULIB) \ @@ -124,11 +142,11 @@ APP3STDLIBS= \ $(SALLIB) .IF "$(GUI)"=="UNX" -APP3STDLIBS+= -lat +APP3STDLIBS+= -l$(SHL1TARGET) .ENDIF .IF "$(GUI)"=="WNT" APP3STDLIBS+= $(LIBCIMT) \ - iat.lib + i$(SHL1TARGET).lib .ENDIF # --- Application 4 - testcorefl main ------------------------------------ @@ -245,8 +263,8 @@ TESTCONV:=com.sun.star.script.XTypeConverter TESTPROXYFAC:=com.sun.star.reflection.XProxyFactory TESTSECURITY:=com.sun.star.security.AllPermission;com.sun.star.security.XPolicy;com.sun.star.security.XAccessController;com.sun.star.io.FilePermission;com.sun.star.connection.SocketPermission;com.sun.star.uno.XCurrentContext -$(BIN)$/test1.rdb: - +cd $(BIN) && regcomp -register -r test1.rdb -c at +$(BIN)$/test1.rdb: $(SHL1TARGETN) + +cd $(BIN) && regcomp -register -r test1.rdb -c $(SHL1TARGET) $(BIN)$/test2.rdb: +cd $(BIN) && regcomp -register -r test2.rdb -c remotebridge.uno$(DLLPOST) |