Author: damjan
Date: Fri Feb 19 17:16:19 2016
New Revision: 1731276
URL: http://svn.apache.org/viewvc?rev=1731276&view=rev
Log:
Merge r1409397 from branches/gbuild: #i117685# own copy target for globlmn.hrc
Build updates by: me
Modified:
openoffice/trunk/ (props changed)
openoffice/trunk/main/svx/AllLangResTarget_svx.mk
openoffice/trunk/main/svx/Package_inc.mk
Propchange: openoffice/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 19 17:16:19 2016
@@ -1,3 +1,4 @@
+/incubator/ooo/branches/gbuild:1409397
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/trunk/main/svx/AllLangResTarget_svx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/AllLangResTarget_svx.mk?rev=1731276&r1=1731275&r2=1731276&view=diff
==============================================================================
--- openoffice/trunk/main/svx/AllLangResTarget_svx.mk (original)
+++ openoffice/trunk/main/svx/AllLangResTarget_svx.mk Fri Feb 19 17:16:19 2016
@@ -106,9 +106,6 @@ $(call gb_SrsPartTarget_get_target,svx/s
$(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:
Modified: openoffice/trunk/main/svx/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Package_inc.mk?rev=1731276&r1=1731275&r2=1731276&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Package_inc.mk (original)
+++ openoffice/trunk/main/svx/Package_inc.mk Fri Feb 19 17:16:19 2016
@@ -133,7 +133,6 @@ $(eval $(call gb_Package_add_file,svx_in
$(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))
