diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
tree | 7d938fd9373eb827095787955e2feffca942b8fd /svx/AllLangResTarget_svx.mk | |
parent | Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 (diff) | |
download | core-9cd038e5b89c978ea24ba7efa7c3152801190455.tar.gz core-9cd038e5b89c978ea24ba7efa7c3152801190455.zip |
fix mis-merge all-around.
Diffstat (limited to 'svx/AllLangResTarget_svx.mk')
-rwxr-xr-x | svx/AllLangResTarget_svx.mk | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index b2707b01a637..3680c9f92609 100755 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -55,7 +55,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/dialog/fontwork.src \ svx/source/dialog/frmsel.src \ svx/source/dialog/hdft.src \ - svx/source/dialog/hyprlink.src \ svx/source/dialog/imapdlg.src \ svx/source/dialog/langbox.src \ svx/source/dialog/language.src \ @@ -107,30 +106,30 @@ $(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_c # just a temporary - globlmn.hrc about to be removed! ifeq ($(strip $(WITH_LANG)),) $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc - echo copying $@ - -mkdir -p $(WORKDIR)/inc/svx - cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc - rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo copying $@ + -mkdir -p $(WORKDIR)/inc/svx + cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk else -include $(WORKDIR)/inc/svx/lastrun.mk ifneq ($(gb_lastrun_globlmn),MERGED) .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc endif $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf - echo merging $@ - -mkdir -p $(WORKDIR)/inc/svx - rm -f $(WORKDIR)/inc/svx/lastrun.mk - echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk - $(call gb_Helper_abbreviate_dirs_native, \ - $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ - -p svx \ - -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) + echo merging $@ + -mkdir -p $(WORKDIR)/inc/svx + rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + -p svx \ + -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) endif .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean $(WORKDIR)/inc/svx/globlmn.hrc_clean : - rm -f $(WORKDIR)/inc/svx/lastrun.mk \ - $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk \ + $(WORKDIR)/inc/svx/globlmn.hrc # vim: set noet sw=4 ts=4: |