Wireshark · Wireshark-commits: [Wireshark-commits] rev 52940: /trunk/ /trunk/epan/: CMakeLists.txt Makefile.am filesystem.c /trunk/

[morriss@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=52940

User: morriss
Date: 2013/10/29 02:28 AM

Log:
 Make it so out-of-tree builds (autofoo and cmake) have access to the various
 data files (diameter/*, COPYING, manuf) when running *shark from the
 build directory.
 
 Do this by passing in the top-level source directory as a compile-time
 definition (unfortunately this has to be in the top-level Makefile too because
 some programs link directly with epan/filesystem.c).
 
 The plugins dir is no longer below the datafile directory but rather the
 progfile directory (if we have one).  Handle the special case of AUTHORS-SHORT
 (a data file but a generated one) by checking the file name before building
 the path.
 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664

Directory: /trunk/epan/
  Changes    Path              Action
  +2 -0      CMakeLists.txt    Modified
  +2 -1      Makefile.am       Modified
  +21 -39    filesystem.c      Modified

Directory: /trunk/
  Changes    Path              Action
  +2 -0      CMakeLists.txt    Modified
  +1 -1      Makefile.am       Modified