From f6d8e391464734ed2a8684de0e21fc24b8c52689 Mon Sep 17 00:00:00 2001
From: Reuben Hawkins <reubenhwk@gmail.com>
Date: Fri, 18 Feb 2011 04:00:06 -0800
Subject: [PATCH] There were roughly 30 headers in the include directory missing from
 nobase_include_HEADERS in include/Makefile.am.  rebuilt the whole list
 with...

find include -name \*.h | sort -u | sed 's/^\.\/\(.*$\)/\t\1 \\/1' >> include/Makefile.am

Also missing were... route/pktloc_syntax.y route/pktloc_grammar.l, but
the flex and bison generated file were not properly cleaned out of the
distribution archve.  Adding the following fix to lib/Makefile.am...

-       route/pktloc_syntax.c route/pktloc_grammar.c route/pktloc.c
+       route/pktloc_syntax.y route/pktloc_grammar.l route/pktloc.c
+
+dist-hook:
+       rm -f $(distdir)/route/pktloc_syntax.c
+       rm -f $(distdir)/route/pktloc_syntax.h
+       rm -f $(distdir)/route/pktloc_grammar.c
+       rm -f $(distdir)/route/pktloc_grammar.h

Also missing: etc/pktloc.  Fixed by adding...

+EXTRA_DIST = etc/pktloc

...in Makefile.am.

modified:   Makefile.am
modified:   include/Makefile.am
modified:   lib/Makefile.am
---
 Makefile.am         |    2 +
 include/Makefile.am |   84 ++++++++++++++++++++++++++++++++++++--------------
 lib/Makefile.am     |    9 +++++-
 3 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8f9438c..57633e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,8 @@ pkgconfig_DATA = libnl-2.0.pc
 sysconfdir = @sysconfdir@/libnl
 sysconf_DATA = etc/pktloc
 
+EXTRA_DIST = etc/pktloc
+
 .PHONY: cscope
 cscope:
 	cscope -b -q -R -Iinclude -slib -ssrc;
diff --git a/include/Makefile.am b/include/Makefile.am
index 8815a6e..3ebc321 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,12 +1,50 @@
 # -*- Makefile -*-
 
 nobase_include_HEADERS = \
+	linux/genetlink.h \
+	linux/gen_stats.h \
+	linux/if_addr.h \
+	linux/if_arp.h \
+	linux/if_ether.h \
+	linux/if.h \
+	linux/if_link.h \
+	linux/if_vlan.h \
+	linux/ip_mp_alg.h \
+	linux/neighbour.h \
+	linux/netfilter.h \
+	linux/netfilter/nfnetlink_conntrack.h \
+	linux/netfilter/nfnetlink.h \
+	linux/netfilter/nfnetlink_log.h \
+	linux/netfilter/nfnetlink_queue.h \
+	linux/netlink.h \
+	linux/pkt_cls.h \
+	linux/pkt_sched.h \
+	linux/rtnetlink.h \
+	netlink/addr.h \
+	netlink/attr.h \
+	netlink/cache-api.h \
+	netlink/cache.h \
+	netlink/cli/addr.h \
+	netlink/cli/ct.h \
+	netlink/cli/link.h \
+	netlink/cli/neigh.h \
+	netlink/cli/qdisc.h \
+	netlink/cli/route.h \
+	netlink/cli/rule.h \
+	netlink/cli/utils.h \
+	netlink/data.h \
+	netlink/errno.h \
 	netlink/fib_lookup/lookup.h \
 	netlink/fib_lookup/request.h \
+	netlink-generic.h \
 	netlink/genl/ctrl.h \
 	netlink/genl/family.h \
 	netlink/genl/genl.h \
 	netlink/genl/mngt.h \
+	netlink/handlers.h \
+	netlink/list.h \
+	netlink-local.h \
+	netlink/msg.h \
 	netlink/netfilter/ct.h \
 	netlink/netfilter/log.h \
 	netlink/netfilter/log_msg.h \
@@ -14,25 +52,35 @@ nobase_include_HEADERS = \
 	netlink/netfilter/nfnl.h \
 	netlink/netfilter/queue.h \
 	netlink/netfilter/queue_msg.h \
-	netlink/addr.h \
-	netlink/attr.h \
-	netlink/cache-api.h \
-	netlink/cache.h \
-	netlink/data.h \
-	netlink/errno.h \
-	netlink/handlers.h \
-	netlink/list.h \
-	netlink/msg.h \
 	netlink/netlink-compat.h \
-	netlink/netlink-kernel.h \
 	netlink/netlink.h \
+	netlink/netlink-kernel.h \
 	netlink/object-api.h \
 	netlink/object.h \
+	netlink/route/addr.h \
+	netlink/route/class.h \
+	netlink/route/classifier.h \
+	netlink/route/classifier-modules.h \
+	netlink/route/class-modules.h \
+	netlink/route/cls/basic.h \
+	netlink/route/cls/cgroup.h \
+	netlink/route/cls/ematch/cmp.h \
+	netlink/route/cls/ematch.h \
 	netlink/route/cls/fw.h \
 	netlink/route/cls/police.h \
 	netlink/route/cls/u32.h \
+	netlink/route/link.h \
 	netlink/route/link/info-api.h \
 	netlink/route/link/vlan.h \
+	netlink/route/neighbour.h \
+	netlink/route/neightbl.h \
+	netlink/route/nexthop.h \
+	netlink/route/pktloc.h \
+	netlink/route/qdisc.h \
+	netlink/route/qdisc-modules.h \
+	netlink/route/route.h \
+	netlink/route/rtnl.h \
+	netlink/route/rule.h \
 	netlink/route/sch/cbq.h \
 	netlink/route/sch/dsmark.h \
 	netlink/route/sch/fifo.h \
@@ -42,22 +90,10 @@ nobase_include_HEADERS = \
 	netlink/route/sch/red.h \
 	netlink/route/sch/sfq.h \
 	netlink/route/sch/tbf.h \
-	netlink/route/addr.h \
-	netlink/route/class-modules.h \
-	netlink/route/class.h \
-	netlink/route/classifier-modules.h \
-	netlink/route/classifier.h \
-	netlink/route/link.h \
-	netlink/route/neighbour.h \
-	netlink/route/neightbl.h \
-	netlink/route/nexthop.h \
-	netlink/route/qdisc-modules.h \
-	netlink/route/qdisc.h \
-	netlink/route/route.h \
-	netlink/route/rtnl.h \
-	netlink/route/rule.h \
 	netlink/route/tc.h \
 	netlink/socket.h \
+	netlink-tc.h \
+	netlink-types.h \
 	netlink/types.h \
 	netlink/utils.h \
 	netlink/version.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 800d479..0ebb9b8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -54,4 +54,10 @@ libnl_route_la_SOURCES = \
 	\
 	fib_lookup/lookup.c fib_lookup/request.c \
 	\
-	route/pktloc_syntax.c route/pktloc_grammar.c route/pktloc.c
+	route/pktloc_syntax.y route/pktloc_grammar.l route/pktloc.c
+
+dist-hook:
+	rm -f $(distdir)/route/pktloc_syntax.c
+	rm -f $(distdir)/route/pktloc_syntax.h
+	rm -f $(distdir)/route/pktloc_grammar.c
+	rm -f $(distdir)/route/pktloc_grammar.h
-- 
1.7.0.4