Wireshark-commits: [Wireshark-commits] master a1a2d50: Make .o files, not .cpp and .h files, depend
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: Fri, 10 Jul 2015 21:30:39 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a1a2d50716ae3c1fb882726c82e98815faca2b27
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

a1a2d50 by Guy Harris (guy@xxxxxxxxxxxx):

    Make .o files, not .cpp and .h files, depend on the ui_*.h files.
    
    That's one of the mechanisms the autotools documentation suggests using
    to handle generated header files.
    
    Using it means that "make dist" will no longer try to build those files
    (they're not part of the distribution - and they can't be, as the files
    would be different for Qt 4 and Qt 5, and need to be generated by the
    uic from the same version of Qt as the one against which Wireshark is
    being built).
    
    This means we don't need to try to find uic, moc, or rcc if we're not
    building with Qt, so don't do so.
    
    Change-Id: Id2aadb8289598b82e14e4ed402ff8cdc15fdef74
    Reviewed-on: https://code.wireshark.org/review/9583
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  a63f841   Netflow: Fix sequence analysis to work for different protocol versions
    adds  a1a2d50   Make .o files, not .cpp and .h files, depend on the ui_*.h files.


Summary of changes:
 acinclude.m4      |  116 +++++++++++++++---------------------------
 configure.ac      |   43 ++++++----------
 ui/qt/Makefile.am |  144 ++++++++++++++++++++++++++++-------------------------
 3 files changed, 132 insertions(+), 171 deletions(-)