diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:14:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:14:19 +0000 |
| commit | 46692abfd9c04b72892c5f04cc957d1960f940ab (patch) | |
| tree | 0e99d157627ce5a43daa33aa43f310f5fce49084 | |
| parent | 4e58a7ddf1c5b41ffaacc0347029ba85f6c92ced (diff) | |
INTEGRATION: CWS ause039 (1.3.10); FILE MERGED
2005/10/14 02:59:42 hjs 1.3.10.2: RESYNC: (1.3-1.4); FILE MERGED
2005/09/13 13:49:54 hjs 1.3.10.1: #i54541# fix makefiles
| -rw-r--r-- | cli_ure/source/basetypes/makefile.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk index 85d5b1c3527c..588c80d4ffb7 100644 --- a/cli_ure/source/basetypes/makefile.mk +++ b/cli_ure/source/basetypes/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-08 01:58:29 $ +# last change: $Author: hr $ $Date: 2005-10-25 11:14:19 $ # # 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_basetypes.dll + $(BIN)$/cli_basetypes.dll CSFILES = \ uno$/Any.cs \ @@ -74,16 +73,14 @@ CSFILES = \ uno$/PolymorphicType.cs \ $(ASSEMBLY_ATTRIBUTES) -# uno$/MethodAtrribute.cs \ - -$(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_basetypes.dll : $(CSFILES) +$(BIN)$/cli_basetypes.dll : $(CSFILES) +$(CSC) $(CSCFLAGS) \ -target:library \ -out:$@ \ |