Wireshark-commits: [Wireshark-commits] rev 47683: / /trunk-1.6/wiretap/: Makefile.am Makefile.nmake

Date: Fri, 15 Feb 2013 21:21:08 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=47683

User: guy
Date: 2013/02/15 01:21 PM

Log:
 Copy over r43387 from trunk, with manual intervention:
 
   ------------------------------------------------------------------------
   r43387 | gerald | 2012-06-19 12:53:03 -0700 (Tue, 19 Jun 2012) | 5 lines
 
   ascend_scanner.c includes ascend.h. Add corresponding makefile
   dependencies, otherwise we might have a race condition when doing
   parallel makes. Hopefully this will fix intermitten buildbot failures
   we've been getting lately.

Directory: /trunk-1.6/wiretap/
  Changes    Path              Action
  +3 -1      Makefile.am       Modified
  +5 -3      Makefile.nmake    Modified