From 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 2 May 2024 11:19:38 +0200 Subject: makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …by a simple/static $(gb_CustomTarget_workdir)/foo The build system has a lot of overly complicated leftovers from when it was introduced and had not only deal with split repositories but also had to coexist with another buildsystem. Along with lots of copy'n'paste along the years the makefiles became hard to grasp for newcomers with all our calls and evals. As a first step to streamline that, the macros from TargetLocations that simply prefix a static path to the argument (and similar of the same kind) are a natural pick before simplifying the rules themselves/getting rid of a bunch of eval statements. Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005 Tested-by: Jenkins Reviewed-by: Christian Lohmaier --- odk/CustomTarget_javadoc.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'odk/CustomTarget_javadoc.mk') diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index acb205610d5c..c23e3f00c293 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -19,16 +19,16 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs/java/ref,\ javadoc_log.txt \ )) -$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/package-list : $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt +$(gb_CustomTarget_workdir)/odk/docs/java/ref/package-list : $(gb_CustomTarget_workdir)/odk/docs/java/ref/javadoc_log.txt touch $@ -$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.css \ -$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.gif \ -$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \ - $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt +$(gb_CustomTarget_workdir)/odk/docs/java/ref/%.css \ +$(gb_CustomTarget_workdir)/odk/docs/java/ref/%.gif \ +$(gb_CustomTarget_workdir)/odk/docs/java/ref/%.html : \ + $(gb_CustomTarget_workdir)/odk/docs/java/ref/javadoc_log.txt touch $@ -$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \ +$(gb_CustomTarget_workdir)/odk/docs/java/ref/javadoc_log.txt : \ $(call gb_Jar_get_target,libreoffice) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JDC) -- cgit o-22.05-testflight LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/include/test/container/xenumerationaccess.hxx
AgeCommit message (Expand)Author