diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-19 14:50:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:16 +0200 |
| commit | 573b8543cb41b88dd6e255a3c566a31a881a3e7e (patch) | |
| tree | 6c5e913f53099980c2a0493048a3f5174a8e90a8 /solenv/gbuild/Library.mk | |
| parent | 3cc8feff1b81ddfe4eafa5cf23e98b1c536f5f1a (diff) | |
start to use instdir for subsequentcheck tests; avoid make dev-install
This commit breaks linkoo.
make dev-install continues to work as before but it's not necessary to
use it anymore.
make check now uses files copied into instdir by gbuild.
TODO: fix remaining issues so that instdir is the same as install/.
Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index fb0ff64296b9..2fd559ab70ea 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -86,13 +86,11 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(if $(call gb_Library_get_instdir,$(1)),\ $(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \ $(call gb_Library_get_install_target,$(1)), \ $(call gb_LinkTarget_get_target,$(2))) \ ) -endif $$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1)))) @@ -129,11 +127,9 @@ define gb_Library__set_soversion_script $(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktargetname,$(1)),$(2),$(3)) $(call gb_Library_get_target,$(1)) : SOVERSION := $(2) $(call gb_Library__add_soversion_link,$(1),$(call gb_Library_get_target,$(1)).$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \ $(call gb_Library_get_install_target,$(1)).$(2), \ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2)) -endif endef |