diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-16 12:13:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:29 +0200 |
| commit | 5905dfeafff2c8071e6f2e212a077b8450d1a0d6 (patch) | |
| tree | a74299c5f8f5150920a49341b596e503fb214715 /smoketest | |
| parent | 031fca3abac5692bf89a2e8a34dead3425154a4f (diff) | |
gbuild: refactor LinkTarget representation
If the link targets are not in workdir then 2 different aspects are
needed: the previously used location relative to workdir's LinkTarget
dir (for all the misc. related targets), and the full target file.
Adding an additional parameter to all LinkTarget functions would be
quite annoying, especially since it would need passing through all the
gb_LinkTarget__use functions in RepositoryExternal.mk; instead encode
both into the linktarget itself, and modify the functions
gb_LinkTarget_get_target to return the target and all others to return
the workdir linktargetname.
- replace gb_Library_get_linktargetname with either:
* gb_Library__get_workdir_linktargetname
* gb_Library__get_linktarget_target
* gb_Library_get_linktarget
- similar for gb_Executable_get_linktargetname
- similar for gb_StaticLibrary_get_linktargetname
- similar for gb_CppunitTest__get_linktargetname
- add calls to gb_LinkTarget__get_workdir_linktargetname where needed
Change-Id: I917ad7957fee50ec2517a9f9cc9ff452c8d97d1b
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/Executable_libtest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index 1b0a16a65f2a..f8bfcaff000a 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Executable_add_exception_objects,libtest,\ )) liblibreoffice_OWN_LD_PATH_DIR := $(gb_DEVINSTALLROOT)/program/libolib -liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library_get_linktargetname,libreoffice) +liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library__get_workdir_linktargetname,libreoffice) $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice) mkdir -p $(liblibreoffice_OWN_LD_PATH_DIR)/Library @@ -36,7 +36,7 @@ $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice) run_libtest: $(liblibreoffice_OWN_LD_SO) $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library" \ - $(call gb_LinkTarget_get_target,Executable/libtest) \ + $(WORKDIR)/LinkTarget/Executable/libtest \ $(gb_DEVINSTALLROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \ # vim: set noet sw=4 ts=4: |