diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-19 08:03:08 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-04-21 18:59:56 +0000 |
| commit | 3db13a7fc9f08fdb238f06e73a42b39396fee84c (patch) | |
| tree | 13962d67e01b8d0f15aed5e6216ae584c23bd991 /ui/gtk | |
| parent | 7c6e859ccf210a45e1cc0f6da17692845e6b5a23 (diff) | |
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>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/about_dlg.c | 2 | ||||
| -rw-r--r-- | ui/gtk/file_import_dlg.c | 2 | ||||
| -rw-r--r-- | ui/gtk/follow_stream.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main_titlebar.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main_welcome.c | 2 | ||||
| -rw-r--r-- | ui/gtk/summary_dlg.c | 2 |
7 files changed, 7 insertions, 7 deletions
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" |