diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-04-06 17:34:33 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-04-06 17:44:57 (GMT) |
| commit | b7504b8b649de6ff6511a8018728ba8aa79e831a (patch) | |
| tree | e13ebbb65f0db1e7bc072a178625292fce675428 | |
| parent | afd7e7c2f1a87ef30a65620db22e2d57c669ffa6 (diff) | |
| download | libnl-b7504b8b649de6ff6511a8018728ba8aa79e831a.zip libnl-b7504b8b649de6ff6511a8018728ba8aa79e831a.tar.gz libnl-b7504b8b649de6ff6511a8018728ba8aa79e831a.tar.bz2 | |
build: sort entries in Makefile.am and .gitignore by name
| -rw-r--r-- | Makefile.am | 46 | ||||
| -rw-r--r-- | src/.gitignore | 32 |
2 files changed, 40 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am index eabad24..1f51124 100644 --- a/Makefile.am +++ b/Makefile.am @@ -627,8 +627,8 @@ cli_programs = \ src/genl-ctrl-list \ src/idiag-socket-details \ src/nf-ct-add \ - src/nf-ct-list \ src/nf-ct-events \ + src/nf-ct-list \ src/nf-exp-add \ src/nf-exp-delete \ src/nf-exp-list \ @@ -670,7 +670,8 @@ cli_programs = \ src/nl-route-list \ src/nl-rule-list \ src/nl-tctree-list \ - src/nl-util-addr + src/nl-util-addr \ + $(NULL) if ENABLE_CLI if ENABLE_CLI_INSTALL_BIN @@ -801,6 +802,7 @@ check_PROGRAMS += \ tests/test-complex-HTB-with-hash-filters \ tests/test-create-bond \ tests/test-create-bridge \ + tests/test-create-geneve \ tests/test-create-ifb \ tests/test-create-ip6tnl \ tests/test-create-ipgre \ @@ -816,24 +818,22 @@ check_PROGRAMS += \ tests/test-create-vlan \ tests/test-create-vrf \ tests/test-create-vxlan \ - tests/test-create-geneve \ tests/test-delete-link \ + tests/test-loopback-up-down \ tests/test-socket-creation \ tests/test-u32-filter-with-actions \ - tests/test-loopback-up-down + $(NULL) +tests_test_complex_HTB_with_hash_filters_CPPFLAGS = $(tests_cppflags) +tests_test_complex_HTB_with_hash_filters_LDADD = $(tests_ldadd) tests_test_create_bond_CPPFLAGS = $(tests_cppflags) tests_test_create_bond_LDADD = $(tests_ldadd) -tests_test_create_vlan_CPPFLAGS = $(tests_cppflags) -tests_test_create_vlan_LDADD = $(tests_ldadd) -tests_test_create_vxlan_CPPFLAGS = $(tests_cppflags) -tests_test_create_vxlan_LDADD = $(tests_ldadd) -tests_test_create_geneve_CPPFLAGS = $(tests_cppflags) -tests_test_create_geneve_LDADD = $(tests_ldadd) -tests_test_create_veth_CPPFLAGS = $(tests_cppflags) -tests_test_create_veth_LDADD = $(tests_ldadd) tests_test_create_bridge_CPPFLAGS = $(tests_cppflags) tests_test_create_bridge_LDADD = $(tests_ldadd) +tests_test_create_geneve_CPPFLAGS = $(tests_cppflags) +tests_test_create_geneve_LDADD = $(tests_ldadd) +tests_test_create_ifb_CPPFLAGS = $(tests_cppflags) +tests_test_create_ifb_LDADD = $(tests_ldadd) tests_test_create_ip6tnl_CPPFLAGS = $(tests_cppflags) tests_test_create_ip6tnl_LDADD = $(tests_ldadd) tests_test_create_ipgre_CPPFLAGS = $(tests_cppflags) @@ -842,6 +842,8 @@ tests_test_create_ipgretap_CPPFLAGS = $(tests_cppflags) tests_test_create_ipgretap_LDADD = $(tests_ldadd) tests_test_create_ipip_CPPFLAGS = $(tests_cppflags) tests_test_create_ipip_LDADD = $(tests_ldadd) +tests_test_create_ipvlan_CPPFLAGS = $(tests_cppflags) +tests_test_create_ipvlan_LDADD = $(tests_ldadd) tests_test_create_ipvti_CPPFLAGS = $(tests_cppflags) tests_test_create_ipvti_LDADD = $(tests_ldadd) tests_test_create_macsec_CPPFLAGS = $(tests_cppflags) @@ -850,24 +852,24 @@ tests_test_create_macvlan_CPPFLAGS = $(tests_cppflags) tests_test_create_macvlan_LDADD = $(tests_ldadd) tests_test_create_macvtap_CPPFLAGS = $(tests_cppflags) tests_test_create_macvtap_LDADD = $(tests_ldadd) -tests_test_create_ipvlan_CPPFLAGS = $(tests_cppflags) -tests_test_create_ipvlan_LDADD = $(tests_ldadd) -tests_test_create_vrf_CPPFLAGS = $(tests_cppflags) -tests_test_create_vrf_LDADD = $(tests_ldadd) tests_test_create_sit_CPPFLAGS = $(tests_cppflags) tests_test_create_sit_LDADD = $(tests_ldadd) -tests_test_create_ifb_CPPFLAGS = $(tests_cppflags) -tests_test_create_ifb_LDADD = $(tests_ldadd) +tests_test_create_veth_CPPFLAGS = $(tests_cppflags) +tests_test_create_veth_LDADD = $(tests_ldadd) +tests_test_create_vlan_CPPFLAGS = $(tests_cppflags) +tests_test_create_vlan_LDADD = $(tests_ldadd) +tests_test_create_vrf_CPPFLAGS = $(tests_cppflags) +tests_test_create_vrf_LDADD = $(tests_ldadd) +tests_test_create_vxlan_CPPFLAGS = $(tests_cppflags) +tests_test_create_vxlan_LDADD = $(tests_ldadd) tests_test_delete_link_CPPFLAGS = $(tests_cppflags) tests_test_delete_link_LDADD = $(tests_ldadd) +tests_test_loopback_up_down_CPPFLAGS = $(tests_cppflags) +tests_test_loopback_up_down_LDADD = $(tests_ldadd) tests_test_socket_creation_CPPFLAGS = $(tests_cppflags) tests_test_socket_creation_LDADD = $(tests_ldadd) -tests_test_complex_HTB_with_hash_filters_CPPFLAGS = $(tests_cppflags) -tests_test_complex_HTB_with_hash_filters_LDADD = $(tests_ldadd) tests_test_u32_filter_with_actions_CPPFLAGS = $(tests_cppflags) tests_test_u32_filter_with_actions_LDADD = $(tests_ldadd) -tests_test_loopback_up_down_CPPFLAGS = $(tests_cppflags) -tests_test_loopback_up_down_LDADD = $(tests_ldadd) check_PROGRAMS += \ tests/test-cache-mngr \ diff --git a/src/.gitignore b/src/.gitignore index c2425e7..e53eb3d 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,19 +1,30 @@ genl-ctrl-list +idiag-socket-details nf-ct-add -nf-ct-list nf-ct-events -nf-exp-list +nf-ct-list nf-exp-add nf-exp-delete +nf-exp-list nf-log nf-monitor +nf-queue nl-addr-add nl-addr-delete nl-addr-list +nl-class-add +nl-class-delete +nl-class-list +nl-classid-lookup +nl-cls-add +nl-cls-delete +nl-cls-list nl-fib-lookup -nl-link-list +nl-link-enslave nl-link-ifindex2name +nl-link-list nl-link-name2ifindex +nl-link-release nl-link-set nl-link-stats nl-list-caches @@ -23,25 +34,14 @@ nl-neigh-add nl-neigh-delete nl-neigh-list nl-neightbl-list +nl-pktloc-lookup nl-qdisc-add nl-qdisc-delete nl-qdisc-list -nl-class-add -nl-class-delete -nl-class-list -nl-cls-add -nl-cls-delete -nl-cls-list nl-route-add nl-route-delete -nl-route-list nl-route-get +nl-route-list nl-rule-list nl-tctree-list nl-util-addr -nf-queue -nl-classid-lookup -nl-pktloc-lookup -nl-link-enslave -nl-link-release -idiag-socket-details |