Rename the rpcap directory to rpcapd.

Everything in that directory is part of rpcapd.

That matches the source layout of WinPcap.

diff --git a/Makefile.in b/Makefile.in
index c809375c84a87fa1620ca73385c47b478426ec65..7f4cc9497e799d15ca956f8fa84c789e6214ad7e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,15 +130,15 @@ HDR = $(PUBHDR) \
        portability.h \
        ppp.h \
        rpcap-protocol.h \
-       rpcap/Makefile.in \
-       rpcap/daemon.c \
-       rpcap/daemon.h \
-       rpcap/fileconf.c \
-       rpcap/fileconf.h \
-       rpcap/rpcapd.c \
-       rpcap/rpcapd.h \
-       rpcap/utils.c \
-       rpcap/utils.h \
+       rpcapd/Makefile.in \
+       rpcapd/daemon.c \
+       rpcapd/daemon.h \
+       rpcapd/fileconf.c \
+       rpcapd/fileconf.h \
+       rpcapd/rpcapd.c \
+       rpcapd/rpcapd.h \
+       rpcapd/utils.c \
+       rpcapd/utils.h \
        sf-pcap.h \
        sf-pcap-ng.h \
        sunatmpos.h
@@ -538,7 +538,7 @@ pcap-config: $(srcdir)/pcap-config.in ./config.status
 # Remote pcap daemon.
 #
 rpcapd: libpcap.a
-       cd rpcap; $(MAKE)
+       cd rpcapd; $(MAKE)
 
 #
 # Test programs - not built by default, and not installed.
@@ -691,7 +691,7 @@ install-archive-shareda:
        #
 
 install-rpcapd:
-       cd rpcap; $(MAKE) DESTDIR=$(DESTDIR) install
+       cd rpcapd; $(MAKE) DESTDIR=$(DESTDIR) install
 
 uninstall: uninstall-shared uninstall-rpcapd
        rm -f $(DESTDIR)$(libdir)/libpcap.a
@@ -746,11 +746,11 @@ uninstall-shared-shareda:
 uninstall-shared-none:
 
 uninstall-rpcapd:
-       cd rpcap; $(MAKE) DESTDIR=$(DESTDIR) uninstall
+       cd rpcapd; $(MAKE) DESTDIR=$(DESTDIR) uninstall
 
 clean:
        rm -f $(CLEANFILES)
-       cd rpcap; $(MAKE) clean
+       cd rpcapd; $(MAKE) clean
 
 distclean: clean
        rm -f Makefile config.cache config.log config.status \
@@ -758,7 +758,7 @@ distclean: clean
            stamp-h stamp-h.in
        rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
        rm -rf autom4te.cache
-       cd rpcap; $(MAKE) distclean
+       cd rpcapd; $(MAKE) distclean
 
 extags: $(TAGFILES)
        ctags $(TAGFILES)
@@ -777,4 +777,4 @@ releasetar:
 
 depend:        $(GENSRC) $(GENHDR) bpf_filter.c
        $(MKDEP) -c $(CC) -m $(CFLAGS) $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC)
-       cd rpcap; $(MAKE) depend
+       cd rpcapd; $(MAKE) depend

diff --git a/configure b/configure
index b04cec7dcbedfc33b76fe359503500959f9be075..8071ecffbbbb66e58db98a9f6ff2c29e50f8af7c 100755 (executable)
--- a/configure
+++ b/configure
@@ -9090,7 +9090,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 ac_config_commands="$ac_config_commands default-1"
 
-ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcap/Makefile"
+ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcapd/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9809,7 +9809,7 @@ do
     "pcap_open_offline.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_open_offline.3pcap" ;;
     "pcap_set_tstamp_precision.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_precision.3pcap" ;;
     "pcap_set_tstamp_type.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_type.3pcap" ;;
-    "rpcap/Makefile") CONFIG_FILES="$CONFIG_FILES rpcap/Makefile" ;;
+    "rpcapd/Makefile") CONFIG_FILES="$CONFIG_FILES rpcapd/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

diff --git a/configure.ac b/configure.ac
index 1d098799c89b376d6ea7b3708e95853a3db0e700..d275bcaf9b48c425e5e7acdcac0feb8ef25463a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1858,5 +1858,5 @@ AC_OUTPUT(Makefile pcap-filter.manmisc pcap-linktype.manmisc
        pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap
        pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap
        pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap
-       pcap_set_tstamp_type.3pcap rpcap/Makefile)
+       pcap_set_tstamp_type.3pcap rpcapd/Makefile)
 exit 0

diff --git a/rpcap/.gitignore b/rpcapd/.gitignore
similarity index 100%
rename from rpcap/.gitignore
rename to rpcapd/.gitignore

diff --git a/rpcap/Makefile.in b/rpcapd/Makefile.in
similarity index 100%
rename from rpcap/Makefile.in
rename to rpcapd/Makefile.in

diff --git a/rpcap/daemon.c b/rpcapd/daemon.c
similarity index 100%
rename from rpcap/daemon.c
rename to rpcapd/daemon.c

diff --git a/rpcap/daemon.h b/rpcapd/daemon.h
similarity index 100%
rename from rpcap/daemon.h
rename to rpcapd/daemon.h

diff --git a/rpcap/fileconf.c b/rpcapd/fileconf.c
similarity index 100%
rename from rpcap/fileconf.c
rename to rpcapd/fileconf.c

diff --git a/rpcap/fileconf.h b/rpcapd/fileconf.h
similarity index 100%
rename from rpcap/fileconf.h
rename to rpcapd/fileconf.h

diff --git a/rpcap/rpcapd.c b/rpcapd/rpcapd.c
similarity index 100%
rename from rpcap/rpcapd.c
rename to rpcapd/rpcapd.c

diff --git a/rpcap/rpcapd.h b/rpcapd/rpcapd.h
similarity index 100%
rename from rpcap/rpcapd.h
rename to rpcapd/rpcapd.h

diff --git a/rpcap/utils.c b/rpcapd/utils.c
similarity index 100%
rename from rpcap/utils.c
rename to rpcapd/utils.c

diff --git a/rpcap/utils.h b/rpcapd/utils.h
similarity index 100%
rename from rpcap/utils.h
rename to rpcapd/utils.h

diff --git a/rpcap/win32-svc.c b/rpcapd/win32-svc.c
similarity index 100%
rename from rpcap/win32-svc.c
rename to rpcapd/win32-svc.c