From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 13 Mar 2017 22:57:20 +0000 (-0700)
Subject: Move rpcap-protocol.h to the top-level directory.
X-Git-Tag: libpcap-1.9-bp~862
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/f5eacd00fa7aaf0513a4a33407691cd45d7da41f?ds=inline

Move rpcap-protocol.h to the top-level directory.

That means that everything in rpcap is part of rpcapd.

Fix up the list of files included in the tarball while we're at it.
---

diff --git a/Makefile.in b/Makefile.in
index 10db68f8..c809375c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,11 +129,16 @@ HDR = $(PUBHDR) \
 	pcap-stdinc.h \
 	portability.h \
 	ppp.h \
+	rpcap-protocol.h \
+	rpcap/Makefile.in \
 	rpcap/daemon.c \
+	rpcap/daemon.h \
 	rpcap/fileconf.c \
-	rpcap/rpcap-protocol.h \
+	rpcap/fileconf.h \
 	rpcap/rpcapd.c \
+	rpcap/rpcapd.h \
 	rpcap/utils.c \
+	rpcap/utils.h \
 	sf-pcap.h \
 	sf-pcap-ng.h \
 	sunatmpos.h
diff --git a/pcap-new.c b/pcap-new.c
index 08ba85c9..3c8e43d2 100644
--- a/pcap-new.c
+++ b/pcap-new.c
@@ -37,7 +37,7 @@
 
 #include "pcap-int.h"	// for the details of the pcap_t structure
 #include "sockutils.h"
-#include "rpcap/rpcap-protocol.h"
+#include "rpcap-protocol.h"
 #include "pcap-rpcap-int.h"
 #include <errno.h>		// for the errno variable
 #include <stdlib.h>		// for malloc(), free(), ...
diff --git a/pcap-rpcap.c b/pcap-rpcap.c
index 4623b2b0..eb4f7050 100644
--- a/pcap-rpcap.c
+++ b/pcap-rpcap.c
@@ -41,7 +41,7 @@
 #include <errno.h>		/* for the errno variable */
 #include "pcap-int.h"
 #include "sockutils.h"
-#include "rpcap/rpcap-protocol.h"
+#include "rpcap-protocol.h"
 #include "pcap-rpcap-int.h"
 
 /*
diff --git a/rpcap/rpcap-protocol.h b/rpcap-protocol.h
similarity index 100%
rename from rpcap/rpcap-protocol.h
rename to rpcap-protocol.h