[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b32a5ee98cd4c0e17b900c77b046f7977cbd12bb
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b32a5ee by Guy Harris (guy@xxxxxxxxxxxx):

    Don't add the wiretap directory to the list of include directories.
    
    If you include something from the wiretap directory, always precede it
    with wiretap/.
    
    Fix some includes of files in the top-level directory to use a path
    relative to the current directory, not relative to the wiretap
    directory.
    
    This makes it a bit clearer what's being included.
    
    Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
    Reviewed-on: https://code.wireshark.org/review/13990
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  7b6e526   EIGRP: Add missing CD (Candidate Default) flag on Legacy Metric
    adds  b32a5ee   Don't add the wiretap directory to the list of include directories.


Summary of changes:
 CMakeLists.txt                |    1 -
 Makefile.am                   |    5 ++---
 Makefile.nmake                |    2 +-
 capchild/Makefile.am          |    3 +--
 capchild/Makefile.nmake       |    2 +-
 caputils/Makefile.am          |    3 +--
 caputils/Makefile.nmake       |    2 +-
 codecs/Makefile.am            |    2 +-
 echld/Makefile.am             |    2 +-
 epan/Makefile.nmake           |    2 +-
 extcap/Makefile.am            |    2 --
 extcap/Makefile.nmake         |    2 +-
 frame_tvbuff.c                |    2 +-
 randpkt_core/Makefile.am      |    3 ---
 randpkt_core/Makefile.nmake   |    2 +-
 ui/Makefile.am                |    3 +--
 ui/Makefile.nmake             |    2 +-
 ui/cli/Makefile.am            |    3 +--
 ui/cli/Makefile.nmake         |    2 +-
 ui/gtk/Makefile.am            |    2 +-
 ui/gtk/Makefile.nmake         |    2 +-
 ui/gtk/about_dlg.c            |    4 ++--
 ui/gtk/capture_dlg.c          |    2 +-
 ui/gtk/capture_if_dlg.c       |    2 +-
 ui/gtk/capture_info_dlg.c     |    2 +-
 ui/gtk/drag_and_drop.c        |    2 +-
 ui/gtk/export_pdu_dlg.c       |    2 +-
 ui/gtk/file_import_dlg.c      |    2 +-
 ui/gtk/fileset_dlg.c          |    2 +-
 ui/gtk/find_dlg.c             |    2 +-
 ui/gtk/goto_dlg.c             |    2 +-
 ui/gtk/main.c                 |   12 ++++++------
 ui/gtk/main_statusbar.c       |    6 +++---
 ui/gtk/main_toolbar.c         |    2 +-
 ui/gtk/mcast_stream_dlg.c     |    2 +-
 ui/gtk/packet_win.c           |    4 ++--
 ui/gtk/proto_help.c           |    2 +-
 ui/gtk/range_utils.c          |    2 +-
 ui/gtk/rlc_lte_graph.c        |    4 ++--
 ui/gtk/rtp_stream_dlg.c       |    2 +-
 ui/gtk/summary_dlg.c          |    4 ++--
 ui/gtk/supported_protos_dlg.c |    2 +-
 ui/gtk/tap_param_dlg.c        |    2 +-
 ui/gtk/voip_calls_dlg.c       |    2 +-
 ui/qt/Makefile.am             |    2 +-
 ui/qt/Wireshark.pro           |    2 +-
 ui/qt/about_dialog.cpp        |    4 ++--
 ui/qt/export_pdu_dialog.cpp   |    2 +-
 ui/tap_export_pdu.c           |    2 +-
 ui/win32/Makefile.nmake       |    2 +-
 wiretap/libpcap.h             |    2 +-
 51 files changed, 61 insertions(+), 72 deletions(-)