diff options
| -rw-r--r-- | wiretap/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wiretap/nettrace_3gpp_32_423.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 2728f6673b..bf1e313d77 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -107,7 +107,6 @@ set_source_files_properties( add_library(wiretap ${WIRETAP_FILES} - $<TARGET_OBJECTS:version_info> ${CMAKE_BINARY_DIR}/image/wiretap.rc ) diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 9f1c570ad7..e33c6cf7e2 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -24,7 +24,6 @@ #include "wtap-int.h" #include "file_wrappers.h" #include "pcap-encap.h" -#include "version_info.h" #include <wsutil/buffer.h> #include "wsutil/tempfile.h" @@ -863,9 +862,10 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_ /* * UTF-8 string containing the name of the application used to create - * this section. + * this section. Avoid the precise version (get_appname_and_version) to + * avoid wiretap rebuilds when only the version changes. */ - wtap_block_add_string_option_format(shb_hdr, OPT_SHB_USERAPPL, "%s", get_appname_and_version()); + wtap_block_add_string_option_format(shb_hdr, OPT_SHB_USERAPPL, "Wireshark %s", VERSION); /* Add header to the array */ g_array_append_val(shb_hdrs, shb_hdr); |