Wireshark-commits: [Wireshark-commits] rev 47682: / /trunk-1.6/epan/dfilter/: Makefile.am /trunk-1.
Date: Fri, 15 Feb 2013 21:10:48 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=47682

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

Log:
 Copy over from 1.8 branch with manual intervention:
 
   ------------------------------------------------------------------------
   r47671 | guy | 2013-02-14 19:00:19 -0800 (Thu, 14 Feb 2013) | 17 lines
 
   Copy over some changes from trunk, with manual intervention:
  
     ------------------------------------------------------------------------
     r47429 | gerald | 2013-02-01 10:20:17 -0800 (Fri, 01 Feb 2013) | 4 lines
 
     Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
     distcheck. Add some rules recommended by the Automake manual in order
     to avoid duplicate actions.
  
   ------------------------------------------------------------------------
     r47430 | gerald | 2013-02-01 12:16:31 -0800 (Fri, 01 Feb 2013) | 3 lines
 
     Go far enough down a rabbit hole and you will encounter libtool. See
     if changing .o to .lo works.
 
   in the hopes of fixing some occasional build failures.
 
   ------------------------------------------------------------------------
   r47678 | guy | 2013-02-15 12:11:04 -0800 (Fri, 15 Feb 2013) | 3 lines
 
   Clean up a bit, matching the trunk's version; this eliminates a
   redundant dependency.
 
   ------------------------------------------------------------------------
   r47679 | guy | 2013-02-15 12:14:29 -0800 (Fri, 15 Feb 2013) | 2 lines
 
   Get rid of a duplicate dependency.
 
   ------------------------------------------------------------------------
   r47680 | guy | 2013-02-15 12:16:25 -0800 (Fri, 15 Feb 2013) | 2 lines
 
   Match the dependency structure of the top of the trunk.

Directory: /trunk-1.6/epan/dfilter/
  Changes    Path           Action
  +1 -0      Makefile.am    Modified

Directory: /trunk-1.6/epan/
  Changes    Path           Action
  +2 -0      Makefile.am    Modified

Directory: /trunk-1.6/plugins/mate/
  Changes    Path           Action
  +3 -1      Makefile.am    Modified