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 10db68f8a18120cc9eecc1fbdb4c73e3f0ab1e48..c809375c84a87fa1620ca73385c47b478426ec65 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,11 +129,16 @@ HDR = $(PUBHDR) \
        pcap-stdinc.h \
        portability.h \
        ppp.h \
        pcap-stdinc.h \
        portability.h \
        ppp.h \

+       rpcap-protocol.h \
+       rpcap/Makefile.in \

        rpcap/daemon.c \
        rpcap/daemon.c \

+       rpcap/daemon.h \

        rpcap/fileconf.c \
        rpcap/fileconf.c \

-       rpcap/rpcap-protocol.h \
+       rpcap/fileconf.h \

        rpcap/rpcapd.c \
        rpcap/rpcapd.c \

+       rpcap/rpcapd.h \

        rpcap/utils.c \
        rpcap/utils.c \

+       rpcap/utils.h \

        sf-pcap.h \
        sf-pcap-ng.h \
        sunatmpos.h
        sf-pcap.h \
        sf-pcap-ng.h \
        sunatmpos.h

diff --git a/pcap-new.c b/pcap-new.c
index 08ba85c9d625b00d31cd507a182e4bea6d983da7..3c8e43d2b24f8f17db76c062d40ebaefbe79d75c 100644 (file)
--- 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 "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(), ...
 #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 4623b2b00c84ce0b9e98ea84c69d04cc9e9fe816..eb4f705034b1d42696cd94b1865ea93f7865c2f2 100644 (file)
--- 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 <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"
 
 /*
 #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