ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)

Browse Source 
…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 <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier
2024-05-03 16:06:14 +02:00
parent d19b79e4b4
commit 0c4c84a14b
155 changed files with 531 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testtools/CustomTarget_bridgetest.mk
+1 -1
View File
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
testtools_BRIDGEDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
testtools_BRIDGEDIR := $(gb_CustomTarget_workdir)/testtools/bridgetest
ifeq ($(OS),WNT)
testtools_BATCHSUFFIX := .bat
testtools/CustomTarget_bridgetest_climaker.mk
+1 -1
View File
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_climaker))
testtools_CLIDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
testtools_CLIDIR := $(gb_CustomTarget_workdir)/testtools/bridgetest_climaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(testtools_CLIDIR)/cli_types_bridgetest.dll
testtools/CustomTarget_bridgetest_javamaker.mk
+1 -1
View File
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker))
testtools_JAVADIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
testtools_JAVADIR := $(gb_CustomTarget_workdir)/testtools/bridgetest_javamaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_JAVADIR)/done
testtools/Jar_testComponent.mk
+1 -1
View File
@@ -28,7 +28,7 @@ $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star
$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE,uno_services))
$(eval $(call gb_Jar_add_packagedirs,testComponent,\
$(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \
$(gb_CustomTarget_workdir)/testtools/bridgetest_javamaker/test \
))
$(eval $(call gb_Jar_add_sourcefiles,testComponent,\