INTEGRATION: CWS jl35 (1.16.12); FILE MERGED
2006/05/19 12:52:40 jl 1.16.12.1: #64551# project did not build when L10N_framework variable was set
This commit is contained in:
parent
ea41f2b166
commit
67842e0981
1 changed files with 5 additions and 4 deletions
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.16 $
|
||||
# $Revision: 1.17 $
|
||||
#
|
||||
# last change: $Author: rt $ $Date: 2006-03-09 10:54:02 $
|
||||
# last change: $Author: rt $ $Date: 2006-07-25 07:55:13 $
|
||||
#
|
||||
# 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 = ure
|
|||
.INCLUDE : $(PRJ)$/util$/target.pmk
|
||||
.INCLUDE : target.mk
|
||||
|
||||
.INCLUDE : $(BIN)$/cliureversion.mk
|
||||
|
||||
.IF "$(USE_SHELL)"!="4nt"
|
||||
ECHOQUOTE='
|
||||
|
@ -55,6 +54,8 @@ ECHOQUOTE=
|
|||
|
||||
.IF "$(BUILD_FOR_CLI)" != ""
|
||||
|
||||
.INCLUDE : $(BIN)$/cliureversion.mk
|
||||
|
||||
ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure_$(TARGET).cs
|
||||
|
||||
POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_URE_POLICY_ASSEMBLY).dll
|
||||
|
@ -70,7 +71,7 @@ CSFILES = \
|
|||
uno$/util$/WeakComponentBase.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_URE_NEW_VERSION)")] \
|
||||
|
|
Loading…
Reference in a new issue