replace this monstrosity with gb_SrsTarget_add_templates

3 files changed, 36 insertions, 38 deletions

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index d030b534baf3..50675cf87243 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
 $(eval $(call gb_SrsTarget_set_include,svx/res,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(WORKDIR)/inc \
     -I$(WORKDIR)/inc/svx \
     -I$(realpath $(SRCDIR)/svx/source/inc) \
     -I$(realpath $(SRCDIR)/svx/source/dialog) \
@@ -98,42 +97,8 @@ $(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
-
-# hack !!!
-# just a temporary - globlmn.hrc about to be removed!
-ifeq ($(strip $(WITH_LANG)),)
-$(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc)
-	echo copying $@
-	-mkdir -p $(WORKDIR)/inc/svx
-	cp $< $@
-	$(call gb_Deliver_deliver, $@, $(OUTDIR)/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 : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) $(realpath $(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 $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) -l all)
-	$(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
-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
-
+$(eval $(call gb_SrsTarget_add_templates,svx/res,\
+	svx/inc/globlmn_tmpl.hrc \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 9a3091f63d09..ab1b5958340c 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,svx,\
     AllLangResTarget_ofa \
     AllLangResTarget_gal \
     AllLangResTarget_textconversiondlgs \
+    Package_globlmn_hrc \
     Package_inc \
     Package_sdi \
 ))
diff --git a/svx/Package_globlmn_hrc.mk b/svx/Package_globlmn_hrc.mk
new file mode 100644
index 000000000000..6fa5fa8c8ffd
--- /dev/null
+++ b/svx/Package_globlmn_hrc.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,svx_globlmn_hrc,$(WORKDIR)/inc/svx))
+
+$(eval $(call gb_Package_add_file,svx_globlmn_hrc,inc/svx/globlmn.hrc,globlmn.hrc))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: