smb2-dissector: learn the "REPLAY_OPERATION" flag

[obnox/wireshark/wip.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d5f26ca0b16883e8fff8f1785e22ef41dfb0ef0..93103615a28ef4740394e52d2b12e1c3d70bc824 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,7 +449,7 @@ endif()
 
 
 # Basedir where to install guides
-set(DOC_DIR "$ENV{docdir}")
+set(DOC_DIR "$ENV{docdir}" CACHE FILEPATH "Installation directory for ug and dg pdfs.")
 message(STATUS "docdir: ${DOC_DIR}")
 
 if(ENABLE_GUIDES)
@@ -567,51 +567,51 @@ set(WIRESHARK_COMMON_SRC
        svnversion.h
        sync_pipe_write.c
        timestats.c
-       util.c
        tap-megaco-common.c
        tap-rtp-common.c
        version_info.c
 )
 
 set(TSHARK_TAP_SRC
-       tap-afpstat.c
-       tap-ansi_astat.c
-       tap-bootpstat.c
-       tap-camelcounter.c
-       tap-camelsrt.c
-       tap-comparestat.c
-       tap-dcerpcstat.c
-       tap-diameter-avp.c
-       tap-expert.c
-       tap-funnel.c
-       tap-gsm_astat.c
-       tap-h225counter.c
-       tap-h225rassrt.c
-       tap-hosts.c
-       tap-httpstat.c
-       tap-icmpstat.c
-       tap-icmpv6stat.c
-       tap-iostat.c
-       tap-iousers.c
-       tap-macltestat.c
-       tap-mgcpstat.c
-       tap-megacostat.c
-       tap-protocolinfo.c
-       tap-protohierstat.c
-       tap-radiusstat.c
-       tap-rlcltestat.c
-       tap-rpcstat.c
-       tap-rpcprogs.c
-       tap-rtp.c
-       tap-rtspstat.c
-       tap-scsistat.c
-       tap-sctpchunkstat.c
-       tap-sipstat.c
-       tap-smbsids.c
-       tap-smbstat.c
-       tap-stats_tree.c
-       tap-sv.c
-       tap-wspstat.c
+       ui/cli/tap-afpstat.c
+       ui/cli/tap-ansi_astat.c
+       ui/cli/tap-bootpstat.c
+       ui/cli/tap-camelcounter.c
+       ui/cli/tap-camelsrt.c
+       ui/cli/tap-comparestat.c
+       ui/cli/tap-dcerpcstat.c
+       ui/cli/tap-diameter-avp.c
+       ui/cli/tap-expert.c
+       ui/cli/tap-follow.c
+       ui/cli/tap-funnel.c
+       ui/cli/tap-gsm_astat.c
+       ui/cli/tap-h225counter.c
+       ui/cli/tap-h225rassrt.c
+       ui/cli/tap-hosts.c
+       ui/cli/tap-httpstat.c
+       ui/cli/tap-icmpstat.c
+       ui/cli/tap-icmpv6stat.c
+       ui/cli/tap-iostat.c
+       ui/cli/tap-iousers.c
+       ui/cli/tap-macltestat.c
+       ui/cli/tap-mgcpstat.c
+       ui/cli/tap-megacostat.c
+       ui/cli/tap-protocolinfo.c
+       ui/cli/tap-protohierstat.c
+       ui/cli/tap-radiusstat.c
+       ui/cli/tap-rlcltestat.c
+       ui/cli/tap-rpcstat.c
+       ui/cli/tap-rpcprogs.c
+       ui/cli/tap-rtp.c
+       ui/cli/tap-rtspstat.c
+       ui/cli/tap-scsistat.c
+       ui/cli/tap-sctpchunkstat.c
+       ui/cli/tap-sipstat.c
+       ui/cli/tap-smbsids.c
+       ui/cli/tap-smbstat.c
+       ui/cli/tap-stats_tree.c
+       ui/cli/tap-sv.c
+       ui/cli/tap-wspstat.c
 )
 
 set(INSTALL_DIRS
@@ -688,6 +688,7 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
                summary.c
                tempfile.c
                u3.c
+               ui/util.c
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
        )
@@ -749,6 +750,7 @@ if(BUILD_tshark)
                tempfile.c
                tshark-tap-register.c
                tshark.c
+               ui/util.c
                ${TSHARK_TAP_SRC}
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
@@ -768,6 +770,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
        set(rawshark_FILES
                ${WIRESHARK_COMMON_SRC}
                rawshark.c
+               ui/util.c
        )
        add_executable(rawshark ${rawshark_FILES})
        add_dependencies(rawshark svnversion)
@@ -782,7 +785,7 @@ if(BUILD_dftest)
        )
        set(dftest_FILES
                dftest.c
-               util.c
+               ui/util.c
        )
        add_executable(dftest ${dftest_FILES})
        set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -1069,6 +1072,7 @@ if(DOC_DIR)
                        WORLD_EXECUTE WORLD_READ
                DESTINATION
                        ${DOC_DIR}/guides
+               FILES_MATCHING
                PATTERN "*.pdf"
        )
 endif()