Wireshark-commits: [Wireshark-commits] master 0426236: Get us building with the subdir-objects auto
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: Thu, 22 Jan 2015 02:12:50 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=042623617bf261c5b8409b1efe5bc798ff54312d
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0426236 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Get us building with the subdir-objects automake option.
    
    subdir-objects will be enabled unconditionally in automake-2.0 and
    automake-1.14 gives us warnings about the upcoming change.
    
    Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
    I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
    the source files rather than the full path to each.
    
    In echld don't use sources in the top-level directory in libechld: it breaks
    distclean with subdir-objects turned on.
    
    Bug: 10648
    Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
    Reviewed-on: https://code.wireshark.org/review/6697
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    

Actions performed:

    from  d93a90b   Make the individual install_ and uninstall_ functions idempotent.
    adds  0426236   Get us building with the subdir-objects automake option.


Summary of changes:
 Makefile.common        |   11 +++++++++++
 configure.ac           |    2 +-
 echld/Makefile.am      |    3 +--
 echld/Makefile.common  |   13 -------------
 epan/wslua/Makefile.am |   38 +++++++++++++++++++-------------------
 epan/wslua/make-reg.pl |   43 +++++++++++++++++++++++++++++--------------
 6 files changed, 61 insertions(+), 49 deletions(-)