[Libreoffice-commits] .: chart2/AllLangResTarget_chartcontroller.mk

David Tardon dtardon at kemper.freedesktop.org
Sun Apr 17 10:07:08 PDT 2011


 chart2/AllLangResTarget_chartcontroller.mk |  123 -----------------------------
 1 file changed, 2 insertions(+), 121 deletions(-)

New commits:
commit 680a82aab7ef5ddbee70b2e8a043b669cf3f5586
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 17 19:02:24 2011 +0200

    move the code to gbuild

diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index af98dd5..98ad177 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
     -I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
     -I$(realpath $(SRCDIR)/chart2/source/controller/main) \
     -I$(realpath $(SRCDIR)/chart2/source/inc) \
-    -I$(WORKDIR)/chart2/inc \
+    -I$(WORKDIR)/inc/chart2 \
     -I$(OUTDIR)/inc \
 ))
 
@@ -90,89 +90,7 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
     chart2/source/controller/menus/ShapeEditContextMenu.src \
 ))
 
-chart2_HrcPartTarget__get_target = $(subst _tmpl,,$(notdir $(1)))
-
-define chart2_HrcPartTarget_get_target
-$(call chart2_HrcTarget__get_inc_dir,$(1))/$(call chart2_HrcPartTarget__get_target,$(1))
-endef
-
-define chart2_HrcPartTarget_HrcPartTarget
-ifeq ($(strip $(WITH_LANG)),)
-$(call chart2_HrcPartTarget_get_target,$(1)) : $(SRCDIR)/$(1)
-	mkdir -p $$(dir $$@) && cp $$< $$@
-else
-$(call chart2_HrcPartTarget_get_target,$(1)) :| $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-$(call chart2_HrcPartTarget_get_target,$(1)) : $$(SDF)
-$(call chart2_HrcPartTarget_get_target,$(1)) : $(SRCDIR)/$(1)
-	$$(call gb_SrsPartMergeTarget__command,$$@,$(1),$$<)
-endif
-endef
-
-define chart2_HrcPartTarget_create_src_dep
-$(call gb_SrsPartTarget_get_target,$(2)) : $(call chart2_HrcPartTarget_get_target,$(1))
-endef
-
-define chart2_HrcPartTarget_create_src_deps
-$(foreach src,$(2),$(eval $(call chart2_HrcPartTarget_create_src_dep,$(1),$(src))))
-endef
-
-chart2_HrcTarget__TARGET_DIR = $(WORKDIR)/chart2
-
-chart2_HrcTarget__get_merged_target = $(chart2_HrcTarget__TARGET_DIR)/merged
-chart2_HrcTarget__get_unmerged_target = $(chart2_HrcTarget__TARGET_DIR)/unmerged
-
-ifeq ($(strip $(WITH_LANG)),)
-chart2_HrcTarget_get_target = $(call chart2_HrcTarget__get_unmerged_target,$(1))
-chart2_HrcTarget__get_update_target = $(call chart2_HrcTarget__get_merged_target,$(1))
-else
-chart2_HrcTarget_get_target = $(call chart2_HrcTarget__get_merged_target,$(1))
-chart2_HrcTarget__get_update_target = $(call chart2_HrcTarget__get_unmerged_target,$(1))
-endif
-
-chart2_HrcTarget__get_inc_dir = $(chart2_HrcTarget__TARGET_DIR)/inc
-
-chart2_HrcTarget_get_clean_target = $(WORKDIR)/Clean/chart2/$(1)
-
-define chart2_HrcTarget_HrcTarget
-$(call chart2_HrcTarget_get_target,$(1)) : PARTS :=
-$(call chart2_HrcTarget_get_clean_target,$(1)) : PARTS :=
-$(call chart2_HrcTarget_get_target,$(1)) : $(call chart2_HrcTarget__get_update_target,$(1))
-	mkdir -p $$(dir $$@) && touch $$@
-$(call chart2_HrcTarget__get_update_target,$(1)) : $(gb_Helper_DUMMY)
-	mkdir -p $$(dir $$@) && touch $$@
-endef
-
-$(call chart2_HrcTarget_get_clean_target,%) : $(gb_Helper_DUMMY)
-	$(call gb_Output_announce,$*,$(false),HRC,4)
-	rm -f $(foreach part,$(PARTS),$(call chart2_HrcPartTarget_get_target,$(part))) \
-		$(call chart2_HrcTarget__get_merged_target,$@) \
-		$(call chart2_HrcTarget__get_unmerged_target,$@)
-
-define chart2_HrcTarget_add_file
-$(call chart2_HrcPartTarget_HrcPartTarget,$(2))
-$(call chart2_HrcTarget_get_target,$(1)) : PARTS += $(2)
-$(call chart2_HrcTarget_get_clean_target,$(1)) : PARTS += $(2)
-$(call chart2_HrcTarget_get_target,$(1)) : $(call chart2_HrcPartTarget_get_target,$(2))
-$(call chart2_HrcPartTarget_get_target,$(2)) : $(call chart2_HrcTarget__get_update_target,$(1))
-ifneq ($(strip $(WITH_LANG)),)
-$(call chart2_HrcPartTarget_get_target,$(2)) : SDF := $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(2))localize.sdf
-endif
-endef
-
-define chart2_HrcTarget_add_files
-$(foreach file,$(2),$(eval $(call chart2_HrcTarget_add_file,$(1),$(file))))
-endef
-
-define chart2_HrcTarget_register
-$(call gb_SrsTarget_get_target,$(2)) :| $(call chart2_HrcTarget_get_target,$(1))
-$(call gb_SrsTarget_get_clean_target,$(2)) : $(call chart2_HrcTarget_get_clean_target,$(1))
-endef
-
-$(eval $(call chart2_HrcTarget_HrcTarget,chart2_hrc))
-
-$(eval $(call chart2_HrcTarget_register,chart2_hrc,chart2/res))
-
-$(eval $(call chart2_HrcTarget_add_files,chart2_hrc,\
+$(eval $(call gb_SrsTarget_add_templates,chart2/res,\
     chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc \
     chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc \
     chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc \
@@ -181,41 +99,4 @@ $(eval $(call chart2_HrcTarget_add_files,chart2_hrc,\
     chart2/source/controller/dialogs/res_Trendline_tmpl.hrc \
 ))
 
-$(eval $(call chart2_HrcPartTarget_create_src_deps,\
-    chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc,\
-    chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
-    chart2/source/controller/dialogs/tp_DataLabel.src \
-))
-
-$(eval $(call chart2_HrcPartTarget_create_src_deps,\
-    chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc,\
-    chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
-    chart2/source/controller/dialogs/tp_ErrorBars.src \
-))
-
-$(eval $(call chart2_HrcPartTarget_create_src_deps,\
-    chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc,\
-    chart2/source/controller/dialogs/dlg_InsertLegend.src \
-    chart2/source/controller/dialogs/tp_LegendPosition.src \
-    chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
-))
-
-$(eval $(call chart2_HrcPartTarget_create_src_deps,\
-    chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc,\
-    chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src \
-    chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
-))
-
-$(eval $(call chart2_HrcPartTarget_create_src_deps,\
-    chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc,\
-    chart2/source/controller/dialogs/dlg_InsertTitle.src \
-    chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
-))
-
-$(eval $(call chart2_HrcPartTarget_create_src_deps,\
-    chart2/source/controller/dialogs/res_Trendline_tmpl.hrc,\
-    chart2/source/controller/dialogs/dlg_InsertTrendline.src \
-    chart2/source/controller/dialogs/tp_Trendline.src \
-))
-
 # vim: set noet ts=4 sw=4:


More information about the Libreoffice-commits mailing list