From 1db544cc34dd74ba3dd70f46d56c376b177dcd0c Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 20 Dec 2011 19:35:11 +0100 Subject: svx: add globlmn.hrc as target from OUTDIR for other modules to depend on --- svx/AllLangResTarget_svx.mk | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index d030b534baf3..f2c9f856c27f 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -98,14 +98,17 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/unodraw/unodraw.src \ )) -$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(WORKDIR)/inc/svx/globlmn.hrc -$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(WORKDIR)/inc/svx/globlmn.hrc -$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/inc/svx/globlmn.hrc -$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc -$(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean +$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTarget_get_clean_target,svx/res) : $(OUTDIR)/inc/svx/globlmn.hrc_clean # hack !!! # just a temporary - globlmn.hrc about to be removed! + +$(OUTDIR)/inc/svx/globlmn.hrc: $(WORKDIR)/inc/svx/globlmn.hrc + ifeq ($(strip $(WITH_LANG)),) $(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) echo copying $@ @@ -130,10 +133,11 @@ $(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc) endif -.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean -$(WORKDIR)/inc/svx/globlmn.hrc_clean : +.PHONY : $(OUTDIR)/inc/svx/globlmn.hrc_clean +$(OUTDIR)/inc/svx/globlmn.hrc_clean : rm -f $(WORKDIR)/inc/svx/lastrun.mk \ - $(WORKDIR)/inc/svx/globlmn.hrc + $(WORKDIR)/inc/svx/globlmn.hrc \ + $(OUTDIR)/inc/svx/globlmn.hrc \ # vim: set noet sw=4 ts=4: -- cgit