diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 11:29:59 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 11:29:59 +0000 |
| commit | 656389bab751f0a2bea30f93847bc5421487144d (patch) | |
| tree | 3a1b123c5f72a9c6f268fda50b54f3423d27a721 /cli_ure/source/ure | |
| parent | 9f4e5bd039e8fd5d15fe7f4b5689b61afa6c5a8f (diff) | |
INTEGRATION: CWS ooo20031216 (1.8.2); FILE MERGED
2003/12/16 05:31:27 vq 1.8.2.2: #23522 tcsh needs quotes, 4NT doesn't
2003/12/13 14:26:37 vq 1.8.2.1: #10000 Remove superfluous \ at the end of a macro definition.
This extra \ stopped guw.pl from working propperly.
Diffstat (limited to 'cli_ure/source/ure')
| -rw-r--r-- | cli_ure/source/ure/makefile.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk index b602618fa537..059cfaa316d5 100644 --- a/cli_ure/source/ure/makefile.mk +++ b/cli_ure/source/ure/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2003-12-01 17:57:56 $ +# last change: $Author: hr $ $Date: 2004-02-04 12:29:59 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,6 +72,12 @@ TARGET = ure .INCLUDE : $(PRJ)$/util$/target.pmk .INCLUDE : target.mk +.IF "$(USE_SHELL)"!="4nt" +ECHOQUOTE=' +.ELSE +ECHOQUOTE= +.ENDIF + .IF "$(BUILD_FOR_CLI)" != "" ALLTAR : \ @@ -81,14 +87,14 @@ CSFILES = \ uno$/util$/DisposeGuard.cs \ uno$/util$/WeakAdapter.cs \ uno$/util$/WeakBase.cs \ - uno$/util$/WeakComponentBase.cs \ + uno$/util$/WeakComponentBase.cs $(OUT)$/bin$/cli_ure.dll : $(CSFILES) $(OUT)$/bin$/cli_types.dll - +echo \ + +echo $(ECHOQUOTE) \ [assembly:System.Reflection.AssemblyVersion( "3.2.0.0" )] \ [assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )] \ [assembly:System.Reflection.AssemblyCompany( "Sun Microsystems, Inc." )] \ -[assembly:System.Reflection.AssemblyCopyright( "2003" )] \ +[assembly:System.Reflection.AssemblyCopyright( "2003" )]$(ECHOQUOTE) \ > $(OUT)$/misc$/assembly.cs +$(WRAPCMD) csc $(CSCFLAGS) \ -target:library \ |