diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 06:54:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 06:54:09 +0000 |
| commit | 45a6d25dc5ba75da853761e0c90044df18a7b108 (patch) | |
| tree | 945981fb3f66b7b9a5d49566e3418b4b0edf8639 /cli_ure/source | |
| parent | 71e3e987e0c1190dee5108687b256430d305489c (diff) | |
INTEGRATION: CWS jl35 (1.6.12); FILE MERGED
2006/05/19 12:52:39 jl 1.6.12.1: #64551# project did not build when L10N_framework variable was set
Diffstat (limited to 'cli_ure/source')
| -rw-r--r-- | cli_ure/source/basetypes/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk index bc05a3a66604..32f49221ef71 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.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2006-03-09 10:51:45 $ +# last change: $Author: rt $ $Date: 2006-07-25 07:54:09 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,6 @@ TARGET = basetypes .INCLUDE : $(PRJ)$/util$/target.pmk .INCLUDE : target.mk -.INCLUDE : $(BIN)$/cliureversion.mk .IF "$(USE_SHELL)"!="4nt" ECHOQUOTE=' @@ -55,6 +54,7 @@ ECHOQUOTE= .IF "$(BUILD_FOR_CLI)" != "" +.INCLUDE : $(BIN)$/cliureversion.mk ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure_$(TARGET).cs POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_BASETYPES_POLICY_ASSEMBLY).dll @@ -75,7 +75,7 @@ CSFILES = \ uno$/PolymorphicType.cs \ $(ASSEMBLY_ATTRIBUTES) -$(ASSEMBLY_ATTRIBUTES) : assembly.cs $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk +$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk $(GNUCOPY) -p assembly.cs $@ +echo $(ECHOQUOTE) \ [assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \ @@ -97,6 +97,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config -keyfile:$(BIN)$/cliuno.snk \ -link:$(BIN)$/cli_basetypes.config + #Create the config file that is used with the policy assembly $(BIN)$/cli_basetypes.config: cli_basetypes_config $(BIN)$/cliureversion.mk +$(PERL) $(PRJ)$/source$/scripts$/subst_template.pl \ |