From: Michael Richardson <mcr@sandelman.ca>
Date: Fri, 31 May 2013 15:06:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'mcrhub/master'
X-Git-Tag: tcpdump-4.5.0~77
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/feb50f848364f748a2d5f31f9e65d50df37a0bcf?hp=-c

Merge remote-tracking branch 'mcrhub/master'
---

feb50f848364f748a2d5f31f9e65d50df37a0bcf
diff --combined Makefile.in
index b91e3507,413124d4..a54e71c0
--- a/Makefile.in
+++ b/Makefile.in
@@@ -41,7 -41,6 +41,7 @@@ VPATH = @srcdir
  #
  
  CC = @CC@
 +MKDEP = @MKDEP@
  PROG = tcpdump
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
@@@ -62,8 -61,6 +62,8 @@@ INSTALL_PROGRAM = @INSTALL_PROGRAM
  INSTALL_DATA = @INSTALL_DATA@
  RANLIB = @RANLIB@
  
 +DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
 +
  # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
  # Also, gcc does not remove the .o before forking 'as', which can be a
  # problem if you don't own the file but can write to the directory.
@@@ -87,7 -84,8 +87,8 @@@ CSRC =	addrtoname.c af.c checksum.c cpa
  	print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
          print-lmp.c print-lspping.c print-lwapp.c \
  	print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c \
- 	print-msnlb.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \
+ 	print-msnlb.c print-nfs.c print-ntp.c print-null.c print-nflog.c \
+ 	print-olsr.c print-ospf.c \
  	print-pgm.c print-pim.c \
  	print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \
  	print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \
@@@ -112,6 -110,7 +113,6 @@@ SRC =	$(CSRC) $(GENSRC) $(LOCALSRC) $(L
  # hack the extra indirection
  OBJ =	$(CSRC:.c=.o) $(GENSRC:.c=.o) $(LOCALSRC:.c=.o) $(LIBOBJS) $(LIBNETDISSECT_OBJ)
  HDR = \
 -	acconfig.h \
  	addrtoname.h \
  	af.h \
  	ah.h \
@@@ -157,7 -156,6 +158,7 @@@
  	machdep.h \
  	mib.h \
  	mpls.h \
 +	mptcp.h \
  	nameser.h \
  	netbios.h \
  	netdissect.h \
@@@ -371,4 -369,4 +372,4 @@@ testlist
  	echo $(TEST_DIST)
  
  depend: $(GENSRC)
 -	${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)
 +	$(MKDEP) -c $(CC) -m $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC)