diff options
| author | Stephan Bergmann <sb@openoffice.org> | 2001-04-23 08:19:29 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sb@openoffice.org> | 2001-04-23 08:19:29 +0000 |
| commit | a332dc22e5aefe9cec5f932fd4a791c51fa64bd2 (patch) | |
| tree | 2bce24eb4ad305dfc3aec25f883b78f0ef3f5e22 /sal | |
| parent | 02b250c4d4bf226594f8c3091be87f94829c3ece (diff) | |
#85712# Added testuri.obj; disabled testint614.obj and testowstring.obj (not working); cleand up.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/test/makefile.mk | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk index 0de5fcd6b7b7..84e79fc58590 100644 --- a/sal/test/makefile.mk +++ b/sal/test/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:17:27 $ +# last change: $Author: sb $ $Date: 2001-04-23 09:19:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,29 +71,26 @@ USE_LDUMP2=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # ------------------------------------------------------------------ -LIB1TARGET= $(SLB)$/$(TARGET).lib - OBJFILES= \ $(OBJ)$/testprofile.obj \ - $(OBJ)$/testint64.obj \ $(OBJ)$/teststring.obj \ $(OBJ)$/testuuid.obj \ - $(OBJ)$/testowstring.obj \ $(OBJ)$/teststrbuf.obj \ - $(OBJ)$/testbyteseq.obj \ + $(OBJ)$/testbyteseq.obj \ + $(OBJ)$/testuri.obj \ $(OBJ)$/test.obj +# $(OBJ)$/testint64.obj \ +# $(OBJ)$/testowstring.obj \ .IF "$(GUI)" == "WNT" SALLIB= isal.lib .ELSE -SALLIB= -lsal1 +SALLIB= -lsal2 .ENDIF @@ -105,9 +102,6 @@ APP2STDLIBS=$(SALLIB) $(TSLLIB) # --- Targets ------------------------------------------------------ -#all: \ -# ALLTAR - .INCLUDE : target.mk # --- SO2-Filter-Datei --- @@ -119,5 +113,3 @@ $(MISC)$/tsl$(UPD)$(DLLPOSTFIX).flt: @echo WEP>$@ @echo LIBMAIN>>$@ @echo LibMain>>$@ - - |