diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2014-10-20 13:24:44 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-10-20 18:24:55 +0200 |
commit | 72cafb8ca35923d3c1f7289ed1386fbf6b23a7ff (patch) | |
tree | 13684139337e1e3070f6dd59789cb9cff598c4b4 | |
parent | 60aee59f18a57b7ad5dbd32adb7f9fb11d67617b (diff) | |
download | NetworkManager-72cafb8ca35923d3c1f7289ed1386fbf6b23a7ff.tar.gz |
build: Don't conditionally omit files from distribution
-rw-r--r-- | callouts/tests/Makefile.am | 4 | ||||
-rw-r--r-- | src/settings/plugins/ibft/tests/Makefile.am | 4 | ||||
-rw-r--r-- | src/settings/plugins/ifnet/tests/Makefile.am | 4 | ||||
-rw-r--r-- | src/settings/plugins/ifupdown/tests/Makefile.am | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index db73ef9372..2e53c5fc16 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -29,10 +29,10 @@ test_dispatcher_envp_LDADD = \ TESTS = test-dispatcher-envp +endif + EXTRA_DIST= \ dispatcher-old-down \ dispatcher-old-up \ dispatcher-old-vpn-down \ dispatcher-old-vpn-up - -endif diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am index 62011759fa..927484f1c9 100644 --- a/src/settings/plugins/ibft/tests/Makefile.am +++ b/src/settings/plugins/ibft/tests/Makefile.am @@ -35,6 +35,8 @@ test_ibft_LDADD = \ TESTS = test-ibft +endif + EXTRA_DIST = \ iscsiadm-test-dhcp \ iscsiadm-test-static \ @@ -46,5 +48,3 @@ EXTRA_DIST = \ iscsiadm-test-bad-record \ iscsiadm-test-vlan -endif - diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index 90d7243020..25001d1363 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -36,6 +36,8 @@ check_ifnet_LDADD = $(top_builddir)/src/libNetworkManager.la check-local: check_ifnet $(abs_builddir)/check_ifnet $(abs_srcdir) $(abs_builddir) +endif + EXTRA_DIST = \ hostname \ net \ @@ -43,5 +45,3 @@ EXTRA_DIST = \ nm-system-settings.conf \ wpa_supplicant.conf \ test_ca_cert.pem - -endif diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index 14a58f87e5..24cdd95504 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -25,10 +25,10 @@ test_ifupdown_LDADD = \ TESTS = test-ifupdown +endif + EXTRA_DIST = \ test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \ test13 test14 test15 test16 test17-wired-static-verify-ip4 \ test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen \ test20-source-stanza test20-source-stanza.eth0 test20-source-stanza.eth1 - -endif |