summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-10-24 21:05:29 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-10-24 21:05:29 +0200
commitbc6071aed696f8c2dccb60dc080e18b6863df45f (patch)
tree68dc80460d2572d4a7e30982b60117834d3814dd
parent25f625b4fc58f56b7ab84dbcfc155bc210f3ee66 (diff)
downloadNetworkManager-bc6071aed696f8c2dccb60dc080e18b6863df45f.tar.gz
build: unconditionally dist ibft test files
Even if ibft support is disabled, test files should be included in distribution. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/65
-rw-r--r--Makefile.am18
1 files changed, 8 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index d735627b67..a572d8421d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2460,6 +2460,13 @@ src_settings_plugins_ibft_tests_test_ibft_LDADD = \
$(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
+ $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so)
+
+check_local += check-local-symbols-settings-ibft
+
+endif
+
EXTRA_DIST += \
src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \
src/settings/plugins/ibft/tests/iscsiadm-test-static \
@@ -2469,16 +2476,7 @@ EXTRA_DIST += \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \
- src/settings/plugins/ibft/tests/iscsiadm-test-vlan
-
-check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
- $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so)
-
-check_local += check-local-symbols-settings-ibft
-
-endif
-
-EXTRA_DIST += \
+ src/settings/plugins/ibft/tests/iscsiadm-test-vlan \
src/settings/plugins/ibft/meson.build \
src/settings/plugins/ibft/tests/meson.build