osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Rename WIRESHARK_COMMON_SRC to SHARK_COMMON_SRC - what's common about it 

is that it includes files used in TShark and rawshark as well as
Wireshark, and that name is what's used by the autotools.

Add capture_sync.c to SHARK_COMMON_CAPTURE_SRC, as it's used both by
Wireshark and TShark, but not by rawshark, and as it's in the autotools
SHARK_COMMON_CAPTURE_SRC.  Move PLATFORM_CAPTURE_SRC from
(WIRE)SHARK_COMMON_SRC to SHARK_COMMON_CAPTURE_SRC, as it should only be
used by programs that capture traffic.

svn path=/trunk/; revision=54668
This commit is contained in:
Guy Harris 2014-01-08 20:10:17 +00:00
parent 9f664e5bdf
commit 005ff3f64d
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -810,13 +810,8 @@ if(WIN32)
)
endif()
set(SHARK_COMMON_CAPTURE_SRC
capture_ifinfo.c
capture_ui_utils.c
)
set(WIRESHARK_COMMON_SRC
${PLATFORM_CAPTURE_SRC}
# sources common for wireshark, tshark, and rawshark
set(SHARK_COMMON_SRC
capture-pcap-util.c
cfutils.c
clopts_common.c
@ -826,6 +821,15 @@ set(WIRESHARK_COMMON_SRC
version_info.c
)
# sources common for wireshark and tshark, but not rawshark;
# these are for programs that capture traffic by running dumpcap
set(SHARK_COMMON_CAPTURE_SRC
${PLATFORM_CAPTURE_SRC}
capture_ifinfo.c
capture_sync.c
capture_ui_utils.c
)
set(TSHARK_TAP_SRC
ui/cli/tap-afpstat.c
ui/cli/tap-ansi_astat.c
@ -934,7 +938,6 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
capture.c
capture_info.c
capture_opts.c
capture_sync.c
color_filters.c
file.c
fileset.c
@ -945,7 +948,7 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
ws80211_utils.c
cfile.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
${SHARK_COMMON_SRC}
${PLATFORM_UI_SRC}
)
endif()
@ -1013,13 +1016,12 @@ if(BUILD_tshark)
)
set(tshark_FILES
capture_opts.c
capture_sync.c
tshark-tap-register.c
tshark.c
cfile.c
${TSHARK_TAP_SRC}
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
${SHARK_COMMON_SRC}
)
add_executable(tshark ${tshark_FILES})
add_dependencies(tshark svnversion)
@ -1041,7 +1043,7 @@ if(BUILD_tfshark)
# tfshark-tap-register.c
${TSHARK_TAP_SRC}
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
${SHARK_COMMON_SRC}
)
add_executable(tfshark ${tfshark_FILES})
add_dependencies(tfshark svnversion)
@ -1059,7 +1061,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
)
set(rawshark_FILES
cfile.c
${WIRESHARK_COMMON_SRC}
${SHARK_COMMON_SRC}
rawshark.c
ui/util.c
)