Unmangle NBT stuff which comes out multi-line in tcpdump

[vinegar-ip.git] / Makefile

diff --git a/Makefile b/Makefile
index 2b20b1fdebf3e8c217e57f4e80fd3447049f9496..894d05bf2f4ab2512831691ea1889699dcf11b65 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,11 +100,13 @@ send-%.pcap send-%.why:   ./make-probes.tcl
                --dest $(DEST) \
                 --xseed "$* $(UNIQUE)" >send-$*.why
 
-%.log:         %.pcap lnumber-tcpdump.pl blank-ttl-ipcsum.pl Makefile
-               tcpdump -tnxvvs$$(($(MTU)+500)) -r $< >$@.0.tmp
-               ./blank-ttl-ipcsum.pl <$@.0.tmp >$@.1.tmp
-               ./lnumber-tcpdump.pl <$@.1.tmp >$@.2.tmp
-               @mv -f $@.2.tmp $@
+%.log: %.pcap Makefile \
+       lnumber-tcpdump.pl blank-ttl-ipcsum.pl tcpdump-nomultiline.pl
+               tcpdump -tnxvvs$$(($(MTU)+500)) -r $< >$@.2.tmp
+               ./tcpdump-nomultiline.pl <$@.2.tmp >$@.3.tmp
+               ./blank-ttl-ipcsum.pl <$@.3.tmp >$@.4.tmp
+               ./lnumber-tcpdump.pl <$@.4.tmp >$@.5.tmp
+               @mv -f $@.5.tmp $@
 
 recv-%.diff:   send-%.log recv-%.log
                diff -uI'^[0-9]' $^ >$@ || test $$? == 1