[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/AllLangResTarget_svx.mk svx/Package_inc.mk

[Damjan Jovanovic]

 svx/AllLangResTarget_svx.mk |   12 +++++++++---
 svx/Package_inc.mk          |    1 -
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit bcf075eb572f1595b0144097877ad787e16edf99
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Feb 19 17:16:19 2016 +0000

    Merge r1409397 from branches/gbuild: #i117685# own copy target for globlmn.hrc
    
    Build updates by: me

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 7aa9bf5..fd9aeb9 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -106,9 +106,6 @@ $(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/in
 $(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
 
-$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc
-	$(call gb_Deliver_deliver,$<,$@)
-
 # hack !!!
 # just a temporary - globlmn.hrc about to be removed!
 ifeq ($(strip $(WITH_LANG)),)
@@ -138,5 +135,14 @@ $(WORKDIR)/inc/svx/globlmn.hrc_clean :
 	rm -f $(WORKDIR)/inc/svx/lastrun.mk \
 		$(WORKDIR)/inc/svx/globlmn.hrc
 
+$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc
+	$(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : $(OUTDIR)/inc/svx/globlmn.hrc_clean
+$(OUTDIR)/inc/svx/globlmn.hrc_clean :
+	rm -f $(OUTDIR)/inc/svx/globlmn.hrc
+
+$(call gb_AllLangResTarget_get_target,svx) : $(OUTDIR)/inc/svx/globlmn.hrc
+
 
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index bf583b7..fda28d5 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -133,7 +133,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galleryitem.hxx,svx/galleryite
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx))