Wireshark-commits: [Wireshark-commits] master-1.12 8f291a7: Backport subdir-objects fix
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: Wed, 27 Jan 2016 15:40:09 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8f291a72d0fcd5c5f8ed2ff2154431248b12b415
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

8f291a7 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    Backport subdir-objects fix
    
    Basically backport I404b074f1558376064c35d8fc96aea7e3d042a76 since the
    same problem as described in bug 10648 applies to master-1.12.
    
    Change-Id: Icde1f820730e3dc8d7f4f9c69eee58c1110aecbe
    Reviewed-on: https://code.wireshark.org/review/13521
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  baa21fb   phdr->pkt_encap needs to be set for seek-read too.
    adds  8f291a7   Backport subdir-objects fix


Summary of changes:
 .gitignore             |    1 +
 Makefile.common        |   11 +++++++++++
 configure.ac           |    2 +-
 echld/Makefile.am      |    3 +--
 echld/Makefile.common  |   20 --------------------
 epan/wslua/Makefile.am |   38 +++++++++++++++++++-------------------
 epan/wslua/make-reg.pl |   21 ++++++++++++++++++---
 7 files changed, 51 insertions(+), 45 deletions(-)