Link version code statically again

This allows keeping the code-sharing with the static linking.

This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more
external dependencies to wsutil than strictly necessary.

A nice side-effect is that libwsutil no longer depends on version.h.

Follow up to f95976eefcbeb5d24df383c29d29ef888b503945.

Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23
Reviewed-on: https://code.wireshark.org/review/15002
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

14 files changed, 14 insertions, 14 deletions

diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index 61a9dc174e..ce66fd2ecf 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -37,7 +37,7 @@
 
 #include "wsutil/file_util.h"
 #include "wsutil/filesystem.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 
 /* XXX - We might want to switch this to a UAT */
 
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 579d3edf05..06c1d9a70b 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -29,7 +29,7 @@
 
 #include <wsutil/filesystem.h>
 #include <wsutil/copyright_info.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #ifdef HAVE_LIBSMI
 #include <epan/oids.h>
 #endif
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index e901b7bd07..5a5816fd27 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -47,7 +47,7 @@
 #include "wsutil/file_util.h"
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 #include "wiretap/wtap_opttypes.h"
 #include "wiretap/pcapng.h"
 
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 183453fb1d..37482e2e02 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -43,7 +43,7 @@
 #include <ui/simple_dialog.h>
 
 #include <wsutil/file_util.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include "gtkglobals.h"
 #include "ui/gtk/keys.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 2c1c564b56..71a4d8e15d 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -59,7 +59,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_err.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include <wiretap/merge.h>
 
diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c
index e1728d48a3..b180b79ca2 100644
--- a/ui/gtk/main_titlebar.c
+++ b/ui/gtk/main_titlebar.c
@@ -32,7 +32,7 @@
 #include "gui_utils.h"
 #include "main_titlebar.h"
 
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 /*
  * Key to attach the "un-decorated" title to the window, so that if the
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index b22ae2b362..696446f7b4 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -33,7 +33,7 @@
 
 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture_ui_utils.h"
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index 84d8f9a1e4..7c52b49dd5 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -28,7 +28,7 @@
 
 
 
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include "../../file.h"
 #include "../../summary.h"
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index 8752e385f3..733fc55ece 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -51,7 +51,7 @@
 #include "wsutil/tempfile.h"
 #include "wsutil/plugins.h"
 #include "wsutil/copyright_info.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 
 #ifdef HAVE_EXTCAP
 #include "extcap.h"
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index 5473a838f4..2d0ff87e60 100644
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -27,7 +27,7 @@
 #include "summary.h"
 
 #include "wsutil/str_util.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 
 #include "qt_ui_utils.h"
 #include "wireshark_application.h"
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 9f04263571..443d10b0e9 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -41,7 +41,7 @@
 
 #include "wsutil/file_util.h"
 #include "wsutil/str_util.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 
 #include "ws_symbol_export.h"
 
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 691a457b6b..b5cb3dc878 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -27,7 +27,7 @@
 
 #include "ui/capture_globals.h"
 
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 
 #include "main_welcome.h"
 #include <ui_main_welcome.h>
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 4b37a5ffed..da39acaaa3 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -26,7 +26,7 @@
 #include "epan/dissector_filters.h"
 #include <epan/epan_dissect.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include <epan/prefs.h>
 #include <epan/stats_tree_priv.h>
 #include <epan/plugin_if.h>
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index e0b2a9fc3c..608e4a1acb 100644
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -27,7 +27,7 @@
 #include "wiretap/pcap-encap.h"
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>