Build fat appropriately for Leopard.

[tcpdump] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 633c59d3eda5f5acefe1a74e932c833b9aeb3f0a..9716e8d05ce91a9b418d87087312ee351dbc4e84 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,7 @@ CSRC =        addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c
        print-eap.c print-eigrp.c\
        print-esp.c print-ether.c print-fddi.c print-fr.c \
        print-gre.c print-hsrp.c print-icmp.c print-igmp.c \
-       print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c \
+       print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \
        print-ipx.c print-isoclns.c print-juniper.c print-krb.c \
        print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
         print-lmp.c print-lspping.c print-lwapp.c \
@@ -89,7 +89,7 @@ CSRC =        addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c
        print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \
        print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c \
        print-timed.c print-token.c print-udld.c print-udp.c print-usb.c \
-       print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \
+       print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-forces.c \
        print-wb.c print-zephyr.c signature.c setsignal.c tcpdump.c util.c
 
 LIBNETDISSECT_SRC=print-isakmp.c
@@ -128,6 +128,7 @@ HDR = \
        ethertype.h \
        extract.h \
        fddi.h \
+       forces.h \
        gmpls.h \
        gmt2local.h \
        icmp6.h \
@@ -139,6 +140,7 @@ HDR = \
        ip.h \
        ip6.h \
        ipfc.h \
+       ipnet.h \
        ipproto.h \
        ipsec_doi.h \
        ipx.h \
@@ -225,7 +227,6 @@ EXTRA_DIST = \
        makemib \
        missing/addrinfo.h \
        missing/addrsize.h \
-       missing/bittypes.h \
        missing/dlnames.c \
        missing/datalinks.c \
        missing/getnameinfo.c \
@@ -260,8 +261,85 @@ EXTRA_DIST = \
        stime.awk \
        strcasecmp.c \
        tcpdump.1.in \
+       tests/02-sunrise-sunset-esp.puu \
+       tests/08-sunrise-sunset-aes.puu \
+       tests/08-sunrise-sunset-esp2.puu \
+       tests/TESTLIST \
+       tests/TESTonce \
+       tests/TESTrun.sh \
+       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.puu \
+       tests/eapon2.puu \
+       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.puu \
+       tests/forces1.out \
+       tests/forces1.pcap \
+       tests/forces1vvv.out \
+       tests/forces1vvvv.out \
+       tests/forces2.out \
+       tests/forces2.pcap \
+       tests/forces2v.out \
+       tests/forces2vv.out \
+       tests/ikev2.puu \
+       tests/ikev2four.out \
+       tests/ikev2four.puu \
+       tests/ikev2fourv.out \
+       tests/ikev2fourv4.out \
+       tests/ikev2pI2-secrets.txt \
+       tests/ikev2pI2.out \
+       tests/ikev2pI2.puu \
+       tests/isakmp-delete-segfault.puu \
+       tests/isakmp-identification-segfault.puu \
+       tests/isakmp-pointer-loop.puu \
+       tests/isakmp1.out \
+       tests/isakmp2.out \
+       tests/isakmp3.out \
+       tests/isakmp4.out \
+       tests/isakmp4500.puu \
+       tests/isis-infinite-loop.pcap \
+       tests/ldp-infinite-loop.pcap \
+       tests/lmp.out \
+       tests/lmp.puu \
+       tests/lmp.sh \
+       tests/lspping-fec-ldp.pcap \
+       tests/lspping-fec-rsvp.pcap \
+       tests/mpls-ldp-hello.out \
+       tests/mpls-ldp-hello.puu \
+       tests/mpls-traceroute.pcap \
+       tests/ospf-gmpls.out \
+       tests/ospf-gmpls.puu \
+       tests/print-A.out \
+       tests/print-AA.out \
+       tests/print-capX.out \
+       tests/print-capXX.out \
+       tests/print-flags.puu \
+       tests/print-flags.sh \
+       tests/print-x.out \
+       tests/print-xx.out \
+       tests/rsvp-infinite-loop.pcap \
        vfprintf.c \
        win32/Include/Arpa/tftp.h \
+       win32/Include/bittypes.h \
        win32/Include/errno.h \
        win32/Include/getopt.h \
        win32/Include/inetprivate.h \
@@ -313,14 +391,13 @@ version.o: version.c
 
 version.c: $(srcdir)/VERSION
        @rm -f $@
-       if grep CVS ${srcdir}/VERSION >/dev/null; then \
+       if grep GIT ${srcdir}/VERSION >/dev/null; then \
                read ver <${srcdir}/VERSION; \
                echo $$ver | tr -d '\012'; \
                date +_%Y_%m_%d; \
        else \
                cat ${srcdir}/VERSION; \
-       fi | sed -e 's/.*/char version[] = "&";/' > $@
-
+       fi | sed -e 's/.*/const char version[] = "&";/' > $@
 
 install: all
        [ -d $(DESTDIR)$(sbindir) ] || \
@@ -347,7 +424,8 @@ distclean:
        rm -f $(CLEANFILES) Makefile config.cache config.log config.status \
            config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1
 
-check:
+check: tcpdump
+       uudecode --help || (echo "No uudecode program found, not running tests"; echo "apt-get/rpm install sharutils?"; exit 1)
        (cd tests && ./TESTrun.sh)
 
 tags: $(TAGFILES)