diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:15:10 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:15:10 +0000 |
commit | 1169f28e111fecb814c06b8b80b0f6ad897911d5 (patch) | |
tree | 6642e1dfe705a11153f127604703f7fe459c7da8 /cli_ure | |
parent | 8e6e78d439a8a1567f59e2e752838453a7cb5d3e (diff) |
INTEGRATION: CWS jl104 (1.20.4); FILE MERGED
2008/06/18 14:25:02 jl 1.20.4.1: #i88078# cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools
Diffstat (limited to 'cli_ure')
-rw-r--r-- | cli_ure/source/ure/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk index f1fe34b73340..1bdbadadcaf2 100644 --- a/cli_ure/source/ure/makefile.mk +++ b/cli_ure/source/ure/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # # This file is part of OpenOffice.org. # @@ -85,11 +85,11 @@ $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliu >> $@ .ENDIF -$(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_types.dll $(BIN)$/cliureversion.mk +$(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_uretypes.dll $(BIN)$/cliureversion.mk $(CSC) $(CSCFLAGS) \ -target:library \ -out:$@ \ - -reference:$(OUT)$/bin$/cli_types.dll \ + -reference:$(OUT)$/bin$/cli_uretypes.dll \ -reference:System.dll \ $(CSFILES) @echo "If code has changed then provide a policy assembly and change the version!" @@ -104,7 +104,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ure.config #Create the config file that is used with the policy assembly $(BIN)$/cli_ure.config: cli_ure_config $(BIN)$/cliureversion.mk - $(PERL) $(PRJ)$/source$/scripts$/subst_template.pl \ + $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \ $< $@ |