Wireshark-commits: [Wireshark-commits] master 58d00ba: Build the extcap programs in the extcap dire
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 15 Feb 2016 08:31:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=58d00bad1a2c4298bd58013e4808899feb657422
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

58d00ba by Guy Harris (guy@xxxxxxxxxxxx):

    Build the extcap programs in the extcap directory.
    
    That lets the version of Wireshark built with autotools find the extcap
    programs.
    
    Don't install the extcap programs under ${datadir} - that puts it under
    a share directory, and share directories are for platform-independent
    files, which executable images aren't (they're instruction-set
    dependent, hence platform-dependent).
    
    Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f
    Reviewed-on: https://code.wireshark.org/review/13943
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  21ab9b2   IMAP: Indentation
    adds  58d00ba   Build the extcap programs in the extcap directory.


Summary of changes:
 CMakeLists.txt                                  |    7 +-
 Makefile.am                                     |   61 +++-------
 Makefile.common                                 |   23 +---
 Makefile.nmake                                  |   11 +-
 configure.ac                                    |    6 +-
 extcap/Makefile.am                              |   74 ++++++++++++
 {capchild => extcap}/Makefile.common            |   16 ++-
 extcap/Makefile.nmake                           |  143 +++++++++++++++++++++++
 extcap/randpktdump.c                            |    2 +-
 packaging/macosx/osx-app.sh                     |   59 ++++++++--
 randpkt.c                                       |    4 +-
 {capchild => randpkt_core}/CMakeLists.txt       |   15 ++-
 {capchild => randpkt_core}/Makefile.am          |   18 +--
 {epan/compress => randpkt_core}/Makefile.common |    8 +-
 {capchild => randpkt_core}/Makefile.nmake       |   14 +--
 {capchild => randpkt_core}/doxygen.cfg.in       |    8 +-
 randpkt-core.c => randpkt_core/randpkt_core.c   |    4 +-
 randpkt-core.h => randpkt_core/randpkt_core.h   |    2 +-
 18 files changed, 344 insertions(+), 131 deletions(-)
 create mode 100644 extcap/Makefile.am
 copy {capchild => extcap}/Makefile.common (84%)
 create mode 100644 extcap/Makefile.nmake
 copy {capchild => randpkt_core}/CMakeLists.txt (83%)
 copy {capchild => randpkt_core}/Makefile.am (85%)
 copy {epan/compress => randpkt_core}/Makefile.common (93%)
 copy {capchild => randpkt_core}/Makefile.nmake (87%)
 copy {capchild => randpkt_core}/doxygen.cfg.in (93%)
 rename randpkt-core.c => randpkt_core/randpkt_core.c (99%)
 rename randpkt-core.h => randpkt_core/randpkt_core.h (99%)