diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:15:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:15:12 +0000 |
| commit | 0fafb207e6b0c6f73bd8ebe8a715cfe635f4afee (patch) | |
| tree | 625005d85bcd8675da41d1a5ca09ed14ac8f73c4 /cli_ure/source/ure | |
| parent | 2c6a4f956e2700bec288c57087079e3b788461d3 (diff) | |
INTEGRATION: CWS ause039 (1.11.10); FILE MERGED
2005/10/14 02:58:43 hjs 1.11.10.2: RESYNC: (1.11-1.12); FILE MERGED
2005/09/13 13:49:56 hjs 1.11.10.1: #i54541# fix makefiles
Diffstat (limited to 'cli_ure/source/ure')
| -rw-r--r-- | cli_ure/source/ure/makefile.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk index af44b8c307ab..1d8df592c8df 100644 --- a/cli_ure/source/ure/makefile.mk +++ b/cli_ure/source/ure/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: rt $ $Date: 2005-09-08 02:02:16 $ +# last change: $Author: hr $ $Date: 2005-10-25 11:15:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -57,11 +57,10 @@ ECHOQUOTE= #policy assembly!!! ASSEMBLY_VERSION="1.0.0.0" -ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure.cs +ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure_$(TARGET).cs ALLTAR : \ - $(ASSEMBLY_ATTRIBUTES) \ - $(OUT)$/bin$/cli_ure.dll + $(BIN)$/cli_ure.dll CSFILES = \ uno$/util$/DisposeGuard.cs \ @@ -70,14 +69,14 @@ CSFILES = \ uno$/util$/WeakComponentBase.cs \ $(ASSEMBLY_ATTRIBUTES) -$(ASSEMBLY_ATTRIBUTES) .PHONY : +$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(GNUCOPY) -p assembly.cs $@ +echo $(ECHOQUOTE) \ [assembly:System.Reflection.AssemblyVersion( $(ASSEMBLY_VERSION))] \ [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \ >> $@ -$(OUT)$/bin$/cli_ure.dll : $(CSFILES) $(OUT)$/bin$/cli_types.dll +$(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_types.dll +$(CSC) $(CSCFLAGS) \ -target:library \ -out:$@ \ |