Update some links.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc1c02e22374532a98eee46995f44b607fdbc39f..98c0bdae6641e92af5152b99d2842895d7ce8245 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,35 +512,36 @@ set(WIRESHARK_COMMON_SRC
 )
 
 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-funnel.c
-        tap-gsm_astat.c
-        tap-h225counter.c
-        tap-h225rassrt.c
-        tap-httpstat.c
-        tap-iostat.c
-        tap-iousers.c
-        tap-mgcpstat.c
-        tap-megacostat.c
-        tap-protocolinfo.c
-        tap-protohierstat.c
-        tap-radiusstat.c
-        tap-rpcstat.c
-        tap-rpcprogs.c
-        tap-rtp.c
-        tap-sctpchunkstat.c
-        tap-sipstat.c
-        tap-smbsids.c
-        tap-smbstat.c
-        tap-stats_tree.c
-        tap-wspstat.c
+       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-funnel.c
+       tap-gsm_astat.c
+       tap-h225counter.c
+       tap-h225rassrt.c
+       tap-httpstat.c
+       tap-iostat.c
+       tap-iousers.c
+       tap-mgcpstat.c
+       tap-megacostat.c
+       tap-protocolinfo.c
+       tap-protohierstat.c
+       tap-radiusstat.c
+       tap-rpcstat.c
+       tap-rpcprogs.c
+       tap-rtp.c
+       tap-sctpchunkstat.c
+       tap-sipstat.c
+       tap-smbsids.c
+       tap-smbstat.c
+       tap-stats_tree.c
+       tap-sv.c
+       tap-wspstat.c
 )
 
 set(INSTALL_DIRS
@@ -559,12 +560,14 @@ set(INSTALL_FILES
        cfilters
        colorfilters
        dfilters
+       ${CMAKE_BINARY_DIR}/dftest.html
        ${CMAKE_BINARY_DIR}/dumpcap.html
        ${CMAKE_BINARY_DIR}/editcap.html
        ${CMAKE_BINARY_DIR}/idl2wrs.html
        ipmap.html
        manuf
        ${CMAKE_BINARY_DIR}/mergecap.html
+       ${CMAKE_BINARY_DIR}/randpkt.html
        ${CMAKE_BINARY_DIR}/rawshark.html
        services
        smi_modules
@@ -576,16 +579,9 @@ set(INSTALL_FILES
 )
 
 set(LIBEPAN_LIBS
-#              @GETOPT_O@      # wsgetopt.c
-#              @INET_ATON_LO@  # epan/inet_aton.c
-#              @INET_NTOP_LO@  # inet_ntop.c
-#              @INET_PTON_LO@  # inet_pton.c
 #              @NSL_LIBS@      # -lnsl
 #              @SOCKET_LIBS@   # -lsocket
 #              @SSL_LIBS@      # -lcrypto
-#              @STRERROR_O@    # strerror.c
-#              @STRNCASECMP_O@ # strncasecmp.c
-#              @STRPTIME_O@    # strptime.c
                epan
 #              $(plugin_ldadd) # in case of static
                ${PCRE_LIBRARIES}
@@ -762,6 +758,7 @@ if(BUILD_capinfos)
                ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(capinfos ${capinfos_FILES})
+       add_dependencies(capinfos svnversion)
        set_target_properties(capinfos PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(capinfos ${capinfos_LIBS})
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -793,8 +790,6 @@ if(BUILD_dumpcap)
                ${CAP_LIBRARIES}
 #              @SOCKET_LIBS@
 #              @NSL_LIBS@
-               ${GCRYPT_LIBRARIES}
-               ${GNUTLS_LIBRARIES}
                ${ZLIB_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
        )
@@ -852,40 +847,30 @@ ADD_CUSTOM_COMMAND(
                ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
 )
 
-ADD_CUSTOM_COMMAND(
-       OUTPUT  wireshark-filter.pod
-       COMMAND tshark
-               -G fields |
-               ${PERL}
-               ${CMAKE_SOURCE_DIR}/doc/dfilter2pod.pl
-               ${CMAKE_SOURCE_DIR}/doc/wireshark-filter.pod.template
-               > wireshark-filter.pod
-       DEPENDS
-               ${CMAKE_SOURCE_DIR}/doc/dfilter2pod.pl
-               ${CMAKE_SOURCE_DIR}/doc/wireshark-filter.pod.template
-               tshark
-)
-
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/capinfos 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dftest 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dumpcap 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/editcap 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2wrs 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/mergecap 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/randpkt 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/rawshark 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
 pod2manhtml( wireshark 1 )
-pod2manhtml( wireshark-filter 4 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/wireshark-filter 4 )
 
 add_custom_target(
        auxiliary ALL
        DEPENDS
                AUTHORS-SHORT
                capinfos.html
+               dftest.html
                dumpcap.html
                editcap.html
                idl2wrs.html
                mergecap.html
+               randpkt.html
                rawshark.html
                text2pcap.html
                tshark.html
@@ -895,10 +880,12 @@ add_custom_target(
 
 set(MAN1_FILES
        ${CMAKE_BINARY_DIR}/capinfos.1
+       ${CMAKE_BINARY_DIR}/dftest.1
        ${CMAKE_BINARY_DIR}/dumpcap.1
        ${CMAKE_BINARY_DIR}/editcap.1
        ${CMAKE_BINARY_DIR}/idl2wrs.1
        ${CMAKE_BINARY_DIR}/mergecap.1
+       ${CMAKE_BINARY_DIR}/randpkt.1
        ${CMAKE_BINARY_DIR}/rawshark.1
        ${CMAKE_BINARY_DIR}/text2pcap.1
        ${CMAKE_BINARY_DIR}/tshark.1