Kaydet (Commit) b7e8ae27 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix clean-up of gb_UIConfig_get_a11yerrors_target

The old code tried to remove non-exisiting *.a11yerrors files corresponding to a
UIConfig's individual *.ui files, not the one single *.a11yerrors file
corresponding to the UIConfig itself.

Also, there's no need to have a UIA11YErrorsTarget merely for clean-up.  Just
do that clean-up as part of gb_UIConfig_get_clean_target.

Change-Id: I6676f08496254398801bb75172c1326d1c843071
Reviewed-on: https://gerrit.libreoffice.org/50156Reviewed-by: 's avatarSamuel Thibault <sthibault@hypra.fr>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst ad1a885e
...@@ -281,7 +281,6 @@ $(eval $(call gb_Helper_make_clean_targets,\ ...@@ -281,7 +281,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
CppunitTestFakeExecutable \ CppunitTestFakeExecutable \
CustomTarget \ CustomTarget \
ExternalProject \ ExternalProject \
UIA11YErrorsTarget \
UIConfig \ UIConfig \
UIImageListTarget \ UIImageListTarget \
UIMenubarTarget \ UIMenubarTarget \
......
...@@ -117,6 +117,8 @@ $(call gb_UIConfig_get_clean_target,%) : ...@@ -117,6 +117,8 @@ $(call gb_UIConfig_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UIConfig_get_target,$*) $(call gb_UIConfig_get_imagelist_target,$*) \ rm -f $(call gb_UIConfig_get_target,$*) $(call gb_UIConfig_get_imagelist_target,$*) \
) )
$(call gb_Output_announce,$*,$(false),UIA,2)
rm -f $(call gb_UIConfig_get_a11yerrors_target,$*)
define gb_UIConfig_a11yerrors__command define gb_UIConfig_a11yerrors__command
$(call gb_Output_announce,$(2),$(true),UIA,1) $(call gb_Output_announce,$(2),$(true),UIA,1)
...@@ -132,11 +134,6 @@ else ...@@ -132,11 +134,6 @@ else
touch $@ touch $@
endif endif
.PHONY : $(call gb_UIA11YErrorsTarget_get_clean_target,%)
$(call gb_UIA11YErrorsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UIA,2)
rm -f $(call gb_UIConfig_get_a11yerrors_target,$*)
gb_UIConfig_get_packagename = UIConfig/$(1) gb_UIConfig_get_packagename = UIConfig/$(1)
gb_UIConfig_get_packagesetname = UIConfig/$(1) gb_UIConfig_get_packagesetname = UIConfig/$(1)
...@@ -190,7 +187,6 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call gb_UIImageListTarget_get_ ...@@ -190,7 +187,6 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call gb_UIImageListTarget_get_
$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UIImageListTarget_get_clean_target,$(2)) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UIImageListTarget_get_clean_target,$(2))
$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui $(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui
$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UIA11YErrorsTarget_get_clean_target,$(2))
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment