diff options
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 160 |
1 files changed, 127 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index ef0f82d0..1e766493 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ check_LTLIBRARIES = check_PROGRAMS = check_programs = +check_local = bin_PROGRAMS = sbin_PROGRAMS = @@ -110,6 +111,7 @@ libnlinclude_netlink_route_HEADERS = \ include/netlink/route/neightbl.h \ include/netlink/route/netconf.h \ include/netlink/route/nexthop.h \ + include/netlink/route/nh.h \ include/netlink/route/pktloc.h \ include/netlink/route/qdisc.h \ include/netlink/route/route.h \ @@ -148,6 +150,7 @@ libnlinclude_netlink_route_linkdir = $(libnlincludedir)/netlink/route/link libnlinclude_netlink_route_link_HEADERS = \ include/netlink/route/link/api.h \ include/netlink/route/link/bonding.h \ + include/netlink/route/link/bridge_info.h \ include/netlink/route/link/bridge.h \ include/netlink/route/link/can.h \ include/netlink/route/link/geneve.h \ @@ -211,6 +214,7 @@ libnlinclude_netlink_cli_HEADERS = \ include/netlink/cli/link.h \ include/netlink/cli/mdb.h \ include/netlink/cli/neigh.h \ + include/netlink/cli/nh.h \ include/netlink/cli/qdisc.h \ include/netlink/cli/route.h \ include/netlink/cli/rule.h \ @@ -219,11 +223,38 @@ libnlinclude_netlink_cli_HEADERS = \ $(NULL) endif +public_headers = \ + $(libnlinclude_netlink_HEADERS) \ + $(libnlinclude_netlink_fib_lookup_HEADERS) \ + $(libnlinclude_netlink_genl_HEADERS) \ + $(libnlinclude_netlink_idiag_HEADERS) \ + $(libnlinclude_netlink_netfilter_HEADERS) \ + $(libnlinclude_netlink_route_HEADERS) \ + $(libnlinclude_netlink_route_act_HEADERS) \ + $(libnlinclude_netlink_route_cls_HEADERS) \ + $(libnlinclude_netlink_route_cls_ematch_HEADERS) \ + $(libnlinclude_netlink_route_link_HEADERS) \ + $(libnlinclude_netlink_route_qdisc_HEADERS) \ + $(libnlinclude_netlink_xfrm_HEADERS) \ + $(libnlinclude_netlink_cli_HEADERS) \ + $(NULL) + noinst_HEADERS = \ + include/base/nl-base-utils.h \ + include/linux-private/linux/atm.h \ + include/linux-private/linux/atmapi.h \ + include/linux-private/linux/atmioc.h \ + include/linux-private/linux/atmsap.h \ + include/linux-private/linux/byteorder/little_endian.h \ include/linux-private/linux/can/netlink.h \ + include/linux-private/linux/const.h \ + include/linux-private/linux/errno.h \ + include/linux-private/linux/ethtool.h \ + include/linux-private/linux/falloc.h \ include/linux-private/linux/fib_rules.h \ include/linux-private/linux/gen_stats.h \ include/linux-private/linux/genetlink.h \ + include/linux-private/linux/hdlc/ioctl.h \ include/linux-private/linux/if.h \ include/linux-private/linux/if_addr.h \ include/linux-private/linux/if_arp.h \ @@ -231,56 +262,70 @@ noinst_HEADERS = \ include/linux-private/linux/if_ether.h \ include/linux-private/linux/if_link.h \ include/linux-private/linux/if_macsec.h \ + include/linux-private/linux/if_packet.h \ include/linux-private/linux/if_tunnel.h \ include/linux-private/linux/if_vlan.h \ include/linux-private/linux/in.h \ include/linux-private/linux/in6.h \ + include/linux-private/linux/in_route.h \ include/linux-private/linux/inet_diag.h \ + include/linux-private/linux/ioctl.h \ include/linux-private/linux/ip.h \ include/linux-private/linux/ipv6.h \ include/linux-private/linux/libc-compat.h \ + include/linux-private/linux/limits.h \ include/linux-private/linux/lwtunnel.h \ include/linux-private/linux/mpls.h \ include/linux-private/linux/mpls_iptunnel.h \ include/linux-private/linux/neighbour.h \ include/linux-private/linux/netconf.h \ + include/linux-private/linux/netdevice.h \ include/linux-private/linux/netfilter.h \ include/linux-private/linux/netfilter/nf_conntrack_common.h \ + include/linux-private/linux/netfilter/nf_conntrack_tcp.h \ include/linux-private/linux/netfilter/nfnetlink.h \ include/linux-private/linux/netfilter/nfnetlink_compat.h \ include/linux-private/linux/netfilter/nfnetlink_conntrack.h \ include/linux-private/linux/netfilter/nfnetlink_log.h \ include/linux-private/linux/netfilter/nfnetlink_queue.h \ include/linux-private/linux/netlink.h \ + include/linux-private/linux/nexthop.h \ include/linux-private/linux/pkt_cls.h \ include/linux-private/linux/pkt_sched.h \ + include/linux-private/linux/posix_types.h \ include/linux-private/linux/rtnetlink.h \ + include/linux-private/linux/seg6.h \ + include/linux-private/linux/seg6_hmac.h \ + include/linux-private/linux/seg6_iptunnel.h \ + include/linux-private/linux/seg6_local.h \ include/linux-private/linux/snmp.h \ include/linux-private/linux/sock_diag.h \ include/linux-private/linux/socket.h \ + include/linux-private/linux/stddef.h \ + include/linux-private/linux/swab.h \ + include/linux-private/linux/taskstats.h \ include/linux-private/linux/tc_act/tc_gact.h \ include/linux-private/linux/tc_act/tc_mirred.h \ include/linux-private/linux/tc_act/tc_nat.h \ include/linux-private/linux/tc_act/tc_skbedit.h \ include/linux-private/linux/tc_act/tc_vlan.h \ + include/linux-private/linux/tc_ematch/tc_em_cmp.h \ include/linux-private/linux/tc_ematch/tc_em_meta.h \ + include/linux-private/linux/tc_ematch/tc_em_nbyte.h \ + include/linux-private/linux/tc_ematch/tc_em_text.h \ + include/linux-private/linux/types.h \ + include/linux-private/linux/version.h \ include/linux-private/linux/veth.h \ include/linux-private/linux/xfrm.h \ - include/netlink-private/cache-api.h \ - include/netlink-private/genl.h \ - include/netlink-private/netlink.h \ - include/netlink-private/nl-auto.h \ - include/netlink-private/object-api.h \ - include/netlink-private/route/link/api.h \ - include/netlink-private/route/link/sriov.h \ - include/netlink-private/route/mpls.h \ - include/netlink-private/route/nexthop-encap.h \ - include/netlink-private/route/tc-api.h \ - include/netlink-private/route/utils.h \ - include/netlink-private/socket.h \ - include/netlink-private/tc.h \ - include/netlink-private/types.h \ - include/netlink-private/utils.h \ + include/nl-aux-core/nl-core.h \ + include/nl-aux-route/nl-route.h \ + include/nl-aux-xfrm/nl-xfrm.h \ + include/nl-default.h \ + include/nl-priv-dynamic-core/cache-api.h \ + include/nl-priv-dynamic-core/nl-core.h \ + include/nl-priv-dynamic-core/object-api.h \ + include/nl-priv-dynamic-route/nl-priv-dynamic-route.h \ + include/nl-priv-static-route/nl-priv-static-route.h \ $(NULL) ############################################################################### @@ -334,15 +379,18 @@ EXTRA_DIST += \ ############################################################################### +default_includes = \ + -I$(srcdir)/include/linux-private \ + -I$(srcdir)/include \ + -I$(builddir)/include \ + $(NULL) + lib_cppflags = \ $(warn_cppflags) \ -D_GNU_SOURCE \ -DSYSCONFDIR=\"$(sysconfdir)/libnl\" \ - -I$(srcdir)/include/linux-private \ - -I$(srcdir)/include \ - -I$(builddir)/include \ - -I$(builddir)/lib/route \ - -I$(builddir)/lib/route/cls + $(default_includes) \ + $(NULL) lib_LTLIBRARIES += lib/libnl-3.la @@ -358,7 +406,9 @@ lib_libnl_3_la_SOURCES = \ lib/hash.c \ lib/hashtable.c \ lib/mpls.c \ + lib/mpls.h \ lib/msg.c \ + lib/nl-core.h \ lib/nl.c \ lib/object.c \ lib/socket.c \ @@ -401,10 +451,12 @@ lib_libnl_route_3_la_SOURCES = \ lib/route/cls/mall.c \ lib/route/cls/police.c \ lib/route/cls/u32.c \ + lib/route/link-sriov.h \ lib/route/link.c \ lib/route/link/api.c \ lib/route/link/bonding.c \ lib/route/link/bridge.c \ + lib/route/link/bridge_info.c \ lib/route/link/can.c \ lib/route/link/dummy.c \ lib/route/link/geneve.c \ @@ -418,6 +470,7 @@ lib_libnl_route_3_la_SOURCES = \ lib/route/link/ipip.c \ lib/route/link/ipvlan.c \ lib/route/link/ipvti.c \ + lib/route/link/link-api.h \ lib/route/link/macsec.c \ lib/route/link/macvlan.c \ lib/route/link/ppp.c \ @@ -433,9 +486,12 @@ lib_libnl_route_3_la_SOURCES = \ lib/route/neigh.c \ lib/route/neightbl.c \ lib/route/netconf.c \ + lib/route/nexthop-encap.h \ lib/route/nexthop.c \ lib/route/nexthop_encap.c \ + lib/route/nh.c \ lib/route/nh_encap_mpls.c \ + lib/route/nl-route.h \ lib/route/pktloc.c \ lib/route/qdisc.c \ lib/route/qdisc/blackhole.c \ @@ -458,6 +514,7 @@ lib_libnl_route_3_la_SOURCES = \ lib/route/route_utils.c \ lib/route/rtnl.c \ lib/route/rule.c \ + lib/route/tc-api.h \ lib/route/tc.c \ $(NULL) nodist_lib_libnl_route_3_la_SOURCES = \ @@ -465,7 +522,11 @@ nodist_lib_libnl_route_3_la_SOURCES = \ EXTRA_lib_libnl_route_3_la_DEPENDENCIES = \ libnl-route-3.sym lib_libnl_route_3_la_CPPFLAGS = \ - $(lib_cppflags) + $(lib_cppflags) \ + -I$(srcdir)/lib/route \ + -I$(builddir)/lib/route \ + -I$(builddir)/lib/route/cls \ + $(NULL) lib_libnl_route_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -Wl,--version-script=$(srcdir)/libnl-route-3.sym @@ -482,6 +543,7 @@ lib_libnl_idiag_3_la_SOURCES = \ lib/idiag/idiag_msg_obj.c \ lib/idiag/idiag_req_obj.c \ lib/idiag/idiag_vegasinfo_obj.c \ + lib/idiag/nl-idiag.h \ $(NULL) EXTRA_lib_libnl_idiag_3_la_DEPENDENCIES = \ libnl-idiag-3.sym @@ -500,6 +562,7 @@ lib_libnl_genl_3_la_SOURCES = \ lib/genl/family.c \ lib/genl/genl.c \ lib/genl/mngt.c \ + lib/genl/nl-genl.h \ $(NULL) EXTRA_lib_libnl_genl_3_la_DEPENDENCIES = \ libnl-genl-3.sym @@ -524,6 +587,7 @@ lib_libnl_nf_3_la_SOURCES = \ lib/netfilter/log_obj.c \ lib/netfilter/netfilter.c \ lib/netfilter/nfnl.c \ + lib/netfilter/nl-netfilter.h \ lib/netfilter/queue.c \ lib/netfilter/queue_msg.c \ lib/netfilter/queue_msg_obj.c \ @@ -545,6 +609,7 @@ lib_LTLIBRARIES += lib/libnl-xfrm-3.la lib_libnl_xfrm_3_la_SOURCES = \ lib/xfrm/ae.c \ lib/xfrm/lifetime.c \ + lib/xfrm/nl-xfrm.h \ lib/xfrm/sa.c \ lib/xfrm/selector.c \ lib/xfrm/sp.c \ @@ -629,6 +694,7 @@ src_lib_libnl_cli_3_la_SOURCES = \ src/lib/exp.c \ src/lib/link.c \ src/lib/neigh.c \ + src/lib/nh.c \ src/lib/qdisc.c \ src/lib/route.c \ src/lib/rule.c \ @@ -642,9 +708,8 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \ -D_GNU_SOURCE \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ - -I$(srcdir)/include/linux-private \ - -I$(srcdir)/include \ - -I$(builddir)/include + $(default_includes) \ + $(NULL) src_lib_libnl_cli_3_la_LDFLAGS = \ $(src_lib_ldflags) \ -Wl,--version-script=$(srcdir)/libnl-cli-3.sym @@ -662,9 +727,8 @@ src_cppflags = \ $(warn_cppflags) \ -D_GNU_SOURCE \ -DSYSCONFDIR=\"$(sysconfdir)/libnl\" \ - -I$(srcdir)/include/linux-private \ - -I$(srcdir)/include \ - -I$(builddir)/include + $(default_includes) \ + $(NULL) src_ldadd = \ src/lib/libnl-cli-3.la \ @@ -712,6 +776,7 @@ cli_programs = \ src/nl-neigh-delete \ src/nl-neigh-list \ src/nl-neightbl-list \ + src/nl-nh-list \ src/nl-pktloc-lookup \ src/nl-qdisc-add \ src/nl-qdisc-delete \ @@ -811,6 +876,8 @@ src_nl_neigh_list_CPPFLAGS = $(src_cppflags) src_nl_neigh_list_LDADD = $(src_ldadd) src_nl_neightbl_list_CPPFLAGS = $(src_cppflags) src_nl_neightbl_list_LDADD = $(src_ldadd) +src_nl_nh_list_CPPFLAGS = $(src_cppflags) +src_nl_nh_list_LDADD = $(src_ldadd) src_nl_pktloc_lookup_CPPFLAGS = $(src_cppflags) src_nl_pktloc_lookup_LDADD = $(src_ldadd) src_nl_qdisc_add_CPPFLAGS = $(src_cppflags) @@ -840,9 +907,8 @@ tests_cppflags = \ $(warn_cppflags) \ -D_GNU_SOURCE \ -DSYSCONFDIR=\"$(sysconfdir)/libnl\" \ - -I$(srcdir)/include/linux-private \ - -I$(srcdir)/include \ - -I$(builddir)/include + $(default_includes) \ + $(NULL) tests_ldadd = \ lib/libnl-3.la \ @@ -1024,6 +1090,12 @@ dist_man8_MANS = \ ############################################################################### +python-build: + cd "$(srcdir)/python"; \ + python setup.py build + +.PHONY: python-build + EXTRA_DIST += \ python/README \ \ @@ -1038,7 +1110,6 @@ EXTRA_DIST += \ python/examples/wiphy.py \ \ python/netlink/capi.i \ - python/netlink/fixes.h \ python/netlink/__init__.py \ python/netlink/core.py \ python/netlink/util.py \ @@ -1063,6 +1134,29 @@ EXTRA_DIST += \ ############################################################################### +%.build-headers-test.c: % + mkdir -p "$(dir $@)" + printf "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@ + +%.build-headers-test.o: %.build-headers-test.c + $(COMPILE) -Wall -Werror -Wno-error=cpp -I$(srcdir)/include -I$(builddir)/include -c -o $@ $< + +BUILD_HEADERS_OBJS = $(patsubst %,%.build-headers-test.o,$(public_headers)) + +# Test whether the public headers are all self-contained and can be build. +# This test is not hooked up as `make check`. +check-local-build-headers: $(BUILD_HEADERS_OBJS) + +CLEANFILES += $(BUILD_HEADERS_OBJS) + +check_local += check-local-build-headers + +############################################################################### + +check-local: $(check_local) + +.PHONY: $(check_local) + check_PROGRAMS += $(check_programs) TESTS += $(check_programs) @@ -1090,6 +1184,6 @@ EXTRA_DIST += \ check-progs: all $(check_PROGRAMS) $(check_LTLIBRARIES) -############################################################################### +.PHONY: check-progs -.PHONY = check-progs +############################################################################### |