diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 10:45:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 10:45:13 +0000 |
| commit | c9a58d3646dac185e4c3ae8ffe93f69b57fd2e9e (patch) | |
| tree | 17151d0530e369d532c3da58faa946a786b29b90 /testtools | |
| parent | c2d280abf75ea629d50bbd83dfd5ff2e8491da39 (diff) | |
INTEGRATION: CWS jl106 (1.3.2); FILE MERGED
2008/07/02 13:57:27 jl 1.3.2.2: #i80475# make runtests work on 64bit systems
2008/07/02 13:22:47 jl 1.3.2.1: #91168# build problems on mingw
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/cliversioning/makefile.mk | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/testtools/source/cliversioning/makefile.mk b/testtools/source/cliversioning/makefile.mk index c12cc7d7b982..825a69bdeee8 100644 --- a/testtools/source/cliversioning/makefile.mk +++ b/testtools/source/cliversioning/makefile.mk @@ -7,7 +7,7 @@ # OpenOffice.org - a multi-platform office productivity suite # # $RCSfile: makefile.mk,v $ -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -37,6 +37,9 @@ TARGET := test_climaker PACKAGE = cliversion .INCLUDE: settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +#.IF "$(BUILD_FOR_CLI)" == "" .IF "$(debug)" != "" CSCFLAGS += -checked+ -define:DEBUG -define:TRACE -debug+ @@ -60,18 +63,23 @@ CLI_BASETYPES = $(SOLARBINDIR)$/cli_basetypes.dll CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cppuhelper.dll CLI_OOOTYPES = $(SOLARBINDIR)$/cli_oootypes.dll -.IF "$(GUI)"=="WNT" -ALLTAR: $(EXETARGET2) \ + +.INCLUDE: target.mk + +.IF "$(BUILD_FOR_CLI)" == "" +ALLTAR: + +.ELSE +ALLTAR: \ + $(EXETARGET2) \ $(TESTLIB) \ $(MISC)$/copyassemblies.done \ COPYVERSIONLIBS \ RUNINSTRUCTIONS -.ELSE -ALLTAR: + .ENDIF - COPYVERSIONLIBS: -$(GNUCOPY) -p $(VERSIONLIBS)$/* $(BIN) @@ -87,7 +95,7 @@ $(MISC)$/copyassemblies.done .ERRREMOVE: CSFILES2 = runtests.cs $(EXETARGET2): $(CSFILES2) - $(CSC) $(CSCFLAGS) -target:exe -out:$(EXETARGET2) \ + $(CSC) $(CSCFLAGS) -target:exe -out:$(EXETARGET2) -platform:x86\ $(CSFILES2) @@ -103,22 +111,6 @@ $(TESTLIB): $(CSFILESLIB) $(SOLARBINDIR)$/cliureversion.mk -#----------------------------------------------------------------------------- -CLIMAKERFLAGS = -.IF "$(debug)" != "" -CLIMAKERFLAGS += --verbose -.ENDIF - - -.IF "$(depend)" == "" -ALL: ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - -.INCLUDE: target.mk - - RUNINSTRUCTIONS : @echo . @echo ########################### N O T E ###################################### @@ -144,3 +136,5 @@ RUNINSTRUCTIONS : @echo . + +#.ENDIF |