make list of all relevant files in tests/ rather than explicitly list them

diff --git a/Makefile.in b/Makefile.in
index 16b45ecbb259bc7a48ea9910690e4ff2d22303b6..06ff410da5006b29d5a1155bee4a2b2e8682c4d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -263,93 +263,8 @@ EXTRA_DIST = \
        stime.awk \
        strcasecmp.c \
        tcpdump.1.in \
        stime.awk \
        strcasecmp.c \
        tcpdump.1.in \

-       tests/02-sunrise-sunset-esp.pcap \
-       tests/08-sunrise-sunset-aes.pcap \
-       tests/08-sunrise-sunset-esp2.pcap \
-       tests/QinQpacket.out \
-       tests/QinQpacket.pcap \
-       tests/QinQpacketv.out \
-       tests/TESTLIST \
-       tests/TESTonce \
-       tests/TESTrun.sh \
-       tests/babel.pcap \
-       tests/babel1.out \
-       tests/babel1v.out \
-       tests/bgp-infinite-loop.pcap \
-       tests/bgp_vpn_attrset.out \
-       tests/bgp_vpn_attrset.pcap \
-       tests/chdlc-slarp-short.pcap \
-       tests/chdlc-slarp.pcap \
-       tests/dio.out \
-       tests/dio.pcap \
-       tests/e1000g.out \
-       tests/e1000g.pcap \
-       tests/eapon1.gdbinit \
-       tests/eapon1.out \
-       tests/eapon1.pcap \
-       tests/empty.uu \
-       tests/esp-secrets.txt \
-       tests/esp0.out \
-       tests/esp1.gdbinit \
-       tests/esp1.out \
-       tests/esp2.gdbinit \
-       tests/esp2.out \
-       tests/esp3.gdbinit \
-       tests/esp4.gdbinit \
-       tests/esp5.gdbinit \
-       tests/esp5.out \
-       tests/espudp1.out \
-       tests/espudp1.pcap \
-       tests/forces1.out \
-       tests/forces1.pcap \
-       tests/forces1vvv.out \
-       tests/forces1vvvv.out \
-       tests/forces2v.out \
-       tests/forces2vv.out \
-       tests/forces3vvv.out \
-       tests/icmpv6.out  \
-       tests/icmpv6.pcap \
-       tests/ikev2four.out \
-       tests/ikev2four.pcap \
-       tests/ikev2fourv.out \
-       tests/ikev2fourv4.out \
-       tests/ikev2pI2-secrets.txt \
-       tests/ikev2pI2.out \
-       tests/ikev2pI2.pcap \
-       tests/isakmp-delete-segfault.pcap \
-       tests/isakmp-identification-segfault.pcap \
-       tests/isakmp-pointer-loop.pcap \
-       tests/isakmp1.out \
-       tests/isakmp2.out \
-       tests/isakmp3.out \
-       tests/isakmp4.out \
-       tests/isakmp4500.pcap \
-       tests/isis-infinite-loop.pcap \
-       tests/ldp-infinite-loop.pcap \
-       tests/lmp.out \
-       tests/lmp.pcap \
-       tests/lmp.sh \
-       tests/lspping-fec-ldp.pcap \
-       tests/lspping-fec-rsvp.pcap \
-       tests/mpls-ldp-hello.out \
-       tests/mpls-ldp-hello.pcap \
-       tests/mpls-traceroute.pcap \
-       tests/ospf-gmpls.out \
-       tests/ospf-gmpls.pcap \
-       tests/pppoe.out \
-       tests/pppoe.pcap \
-       tests/print-A.out \
-       tests/print-AA.out \
-       tests/print-capX.out \
-       tests/print-capXX.out \
-       tests/print-flags.pcap \
-       tests/print-flags.sh \
-       tests/print-x.out \
-       tests/print-xx.out \
-       tests/rsvp-infinite-loop.pcap \
-       tests/sflow_multiple_counter_30_pdus.out \
-       tests/sflow_multiple_counter_30_pdus.pcap \

        vfprintf.c \
        vfprintf.c \

+       win32/Include/bittypes.h \

        win32/Include/errno.h \
        win32/Include/getopt.h \
        win32/Include/w32_fzs.h \
        win32/Include/errno.h \
        win32/Include/getopt.h \
        win32/Include/w32_fzs.h \


@@ -358,6 +273,8 @@ EXTRA_DIST = \
        win32/prj/WinDump.dsp \
        win32/prj/WinDump.dsw
 
        win32/prj/WinDump.dsp \
        win32/prj/WinDump.dsw
 

+TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -type f \! -name '.*' \! -name '*~' -print`
+

 all: $(PROG)
 
 $(PROG): $(OBJ) @V_PCAPDEP@
 all: $(PROG)
 
 $(PROG): $(OBJ) @V_PCAPDEP@


@@ -443,9 +360,12 @@ TAGS: $(TAGFILES)
 releasetar:
        @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
           mkdir $$name; \
 releasetar:
        @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
           mkdir $$name; \

-          tar cf - $(CSRC) $(HDR) $(LIBNETDISSECT_SRC) $(EXTRA_DIST) | (cd $$name; tar xf -); \
+          tar cf - $(CSRC) $(HDR) $(LIBNETDISSECT_SRC) $(EXTRA_DIST) $(TEST_DIST) | (cd $$name; tar xf -); \

           tar -c -z -f $$name.tar.gz $$name; \
           rm -rf $$name
 
           tar -c -z -f $$name.tar.gz $$name; \
           rm -rf $$name
 

+testlist:
+       echo $(TEST_DIST)
+

 depend: $(GENSRC)
        ${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)
 depend: $(GENSRC)
        ${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)