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>

diff --git a/.editorconfig b/.editorconfig
index ae27dd7298e132cab61e0af5d4e0d2c34d58e671..0cffa1f6359217a102eb114c56e8d2f20e148905 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -68,3 +68,7 @@ indent_size = 2
 [randpkt_core.[ch]]
 indent_style = tab
 indent_size = tab
+
+[ws_version_info.[ch]]
+indent_style = tab
+indent_size = tab

diff --git a/.gitignore b/.gitignore
index 0d69824acffad70e65b958da2e32a8c8668bc73b..cc0520d2006ab2e21a2b4fb5c7ba2461c8671a9c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ epan/register_wslua.c
 epan/taps.txt
 epan/taps_wslua.c
 epan/uat_load.c
+epan/ws_version_info.c
 epan/wslua/declare_wslua.h
 epan/wslua/register_wslua.c
 epan/wslua/taps.txt
@@ -57,6 +58,7 @@ tshark-tap-register.c
 wiretap/ascend.c
 wiretap/ascend.h
 wiretap/k12text.c
+wiretap/ws_version_info.c
 wireshark-tap-register.c
 wireshark-tap-register-cache.pkl
 ui/gtk/wireshark-gresources.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a4800ae9d1490bd311dd154c5743444ddfc82a8..fdf7bb3b1685b08cb21888444fa35fd2eafb4753 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1257,6 +1257,7 @@ set(SHARK_COMMON_SRC
        cfile.c
        frame_tvbuff.c
        sync_pipe_write.c
+       ws_version_info.c
 )
 
 # sources for external capture interfaces
@@ -2135,6 +2136,7 @@ if(BUILD_randpkt)
        )
        set(randpkt_FILES
                randpkt.c
+               ws_version_info.c
        )
        add_executable(randpkt ${randpkt_FILES})
        set_extra_executable_properties(randpkt "Executables")
@@ -2151,6 +2153,7 @@ if(BUILD_text2pcap)
        )
        set(text2pcap_CLEAN_FILES
                text2pcap.c
+               ws_version_info.c
        )
        set(text2pcap_FILES
                ${text2pcap_CLEAN_FILES}
@@ -2173,6 +2176,7 @@ if(BUILD_mergecap)
        )
        set(mergecap_FILES
                mergecap.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/mergecap.rc
        )
        add_executable(mergecap ${mergecap_FILES})
@@ -2189,6 +2193,7 @@ if(BUILD_reordercap)
        )
        set(reordercap_FILES
                reordercap.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/reordercap.rc
        )
        add_executable(reordercap ${reordercap_FILES})
@@ -2207,6 +2212,7 @@ if(BUILD_capinfos)
        )
        set(capinfos_FILES
                capinfos.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/capinfos.rc
        )
        add_executable(capinfos ${capinfos_FILES})
@@ -2224,6 +2230,7 @@ if(BUILD_captype)
        )
        set(captype_FILES
                captype.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/captype.rc
        )
        add_executable(captype ${captype_FILES})
@@ -2240,6 +2247,7 @@ if(BUILD_editcap)
        )
        set(editcap_FILES
                editcap.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/editcap.rc
        )
        add_executable(editcap ${editcap_FILES})
@@ -2270,6 +2278,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
                filter_files.c
                ringbuffer.c
                sync_pipe_write.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/dumpcap.rc
        )
        add_executable(dumpcap ${dumpcap_FILES})

diff --git a/Makefile.common b/Makefile.common
index bcdc6e195abf40aa850fb84bda5b3e9f9957d66c..e18ce019e466760316cc0b20d731612ec679b69d 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -71,7 +71,8 @@ WIRESHARK_COMMON_SRC =        \
        file.c          \
        fileset.c       \
        filter_files.c \
-       summary.c
+       summary.c       \
+       ws_version_info.c
 
 # corresponding headers
 WIRESHARK_COMMON_INCLUDES =    \
@@ -88,45 +89,54 @@ tshark_SOURCES =    \
        $(SHARK_COMMON_SRC)     \
        capture_opts.c          \
        filter_files.c          \
-       tshark.c
+       tshark.c                \
+       ws_version_info.c
 
 # tfshark specifics
 tfshark_SOURCES =      \
        $(SHARK_COMMON_SRC)     \
-       tfshark.c
+       tfshark.c               \
+       ws_version_info.c
 
 # rawshark specifics
 rawshark_SOURCES =     \
        $(SHARK_COMMON_SRC)     \
-       rawshark.c
+       rawshark.c              \
+       ws_version_info.c
 
 # text2pcap specifics
 text2pcap_SOURCES = \
        text2pcap.c             \
-       text2pcap-scanner.l
+       text2pcap-scanner.l     \
+       ws_version_info.c
 
 text2pcap_INCLUDES = \
        text2pcap.h
 
 # mergecap specifics
 mergecap_SOURCES = \
-       mergecap.c
+       mergecap.c      \
+       ws_version_info.c
 
 # editcap specifics
 editcap_SOURCES = \
-       editcap.c
+       editcap.c       \
+       ws_version_info.c
 
 # reordercap specifics
 reordercap_SOURCES = \
-       reordercap.c
+       reordercap.c    \
+       ws_version_info.c
 
 # capinfos specifics
 capinfos_SOURCES = \
-       capinfos.c
+       capinfos.c      \
+       ws_version_info.c
 
 # captype specifics
 captype_SOURCES = \
-       captype.c
+       captype.c       \
+       ws_version_info.c
 
 # dftest specifics
 dftest_SOURCES =       \
@@ -144,7 +154,8 @@ echld_test_SOURCES =        \
 
 # randpkt specifics
 randpkt_SOURCES = \
-       randpkt.c
+       randpkt.c       \
+       ws_version_info.c
 
 # dumpcap specifics
 dumpcap_SOURCES =      \
@@ -154,7 +165,8 @@ dumpcap_SOURCES =   \
        dumpcap.c       \
        filter_files.c  \
        ringbuffer.c    \
-       sync_pipe_write.c
+       sync_pipe_write.c       \
+       ws_version_info.c
 
 # corresponding headers
 dumpcap_INCLUDES = \
@@ -168,4 +180,5 @@ noinst_HEADERS =    \
        $(EXTCAP_COMMON_INCLUDES) \
        $(WIRESHARK_COMMON_INCLUDES) \
        $(dumpcap_INCLUDES) \
-       ws_diag_control.h
+       ws_diag_control.h       \
+       ws_version_info.h

diff --git a/capinfos.c b/capinfos.c
index b43f3083b0673b6c08ddd3fab997f877af887e1f..0cd7ac0a9ffcdb9faf683f391f532ef4329dabd6 100644 (file)
--- a/capinfos.c
+++ b/capinfos.c
@@ -74,7 +74,7 @@
 #include <wsutil/crash_info.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/pcapng.h>
 

diff --git a/captype.c b/captype.c
index 50f1823f95b83dc7a753143c8a311887bd9a4b68..942bc59695648a37179945a7cc204bf8c53790b5 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -44,7 +44,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>

diff --git a/configure.ac b/configure.ac
index 07690a6d2058cd8280fd031dc8687c1f113db4b2..14237285edb903a88160ddc1496ca77d967cf3ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,7 @@ AX_PROG_CC_FOR_BUILD
 #
 AC_PROG_SED
 
+AC_PROG_LN_S
 AC_PROG_MKDIR_P
 
 AC_PATH_PROG(PERL, perl)

diff --git a/debian/libwsutil0.symbols b/debian/libwsutil0.symbols
index d79925b19683c002ada8adc8a886685b714ef93e..c7e85ab4106462d63f2af60b1b18cdefd5eeab70 100644 (file)
--- a/debian/libwsutil0.symbols
+++ b/debian/libwsutil0.symbols
@@ -55,7 +55,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
  find_last_pathname_separator@Base 1.12.0~rc1
  format_size@Base 1.10.0
  get_basename@Base 1.12.0~rc1
- get_compiled_version_info@Base 1.99.2
  get_copyright_info@Base 1.99.0
  get_cur_groupname@Base 1.10.0
  get_cur_username@Base 1.10.0
@@ -74,10 +73,8 @@ libwsutil.so.0 libwsutil0 #MINVER#
  get_profile_name@Base 1.12.0~rc1
  get_profiles_dir@Base 1.12.0~rc1
  get_progfile_dir@Base 1.12.0~rc1
- get_runtime_version_info@Base 1.99.2
  get_systemfile_dir@Base 1.12.0~rc1
  get_tempfile_path@Base 1.12.0~rc1
- get_ws_vcs_version_info@Base 1.99.0
  has_global_profiles@Base 1.12.0~rc1
  ieee80211_chan_to_mhz@Base 1.99.7
  ieee80211_mhz_to_chan@Base 1.99.7
@@ -152,7 +149,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
  sha256_hmac_update@Base 2.1.0
  sha256_starts@Base 2.1.0
  sha256_update@Base 2.1.0
- show_version@Base 1.99.2
  sober128_add_entropy@Base 1.99.0
  sober128_read@Base 1.99.0
  sober128_start@Base 1.99.0

diff --git a/dumpcap.c b/dumpcap.c
index a44d4f0d3627f1a39c659136e636fd4564704524..21230b7ec754a438692e7e83a5420127fa1274c8 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -56,7 +56,7 @@
 
 #include <wsutil/cmdarg_err.h>
 #include <wsutil/crash_info.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"

diff --git a/echld/echld-int.h b/echld/echld-int.h
index fe01f83383086c5dfcf187e31b476c9f5c0751ac..78c6032dc09d7693570133dbca7e33d72734ea12 100644 (file)
--- a/echld/echld-int.h
+++ b/echld/echld-int.h
@@ -69,7 +69,7 @@
 #include "wsutil/privileges.h"
 #include "wsutil/filesystem.h"
 #include "wsutil/copyright_info.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 #include "epan/addr_resolv.h"
 #include "epan/epan.h"
 #include "epan/prefs.h"

diff --git a/editcap.c b/editcap.c
index 4384a89fbc6fc2008d465f19d339c570be2ecf6d..0bcab3308c7b1fc17df15d268f5d854045c805dd 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -83,7 +83,7 @@
 #include <wsutil/report_err.h>
 #include <wsutil/strnatcmp.h>
 #include <wsutil/str_util.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include <wsutil/pint.h>
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/pcapng.h>

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 82d0169d3ecce212985eae69408d43f9448dd9c3..33d63a6c024ece6974fbc641165665e3fafb01a1 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -168,6 +168,7 @@ set(LIBWIRESHARK_FILES
        uat.c
        value_string.c
        xdlc.c
+       ${CMAKE_SOURCE_DIR}/ws_version_info.c
 )
 
 set(LIBWIRESHARK_CLEAN_FILES

diff --git a/epan/Makefile.am b/epan/Makefile.am
index a7af0d83a2189ede35bb3d0a5ecd85d502fa264b..f16ce7ff4288251e9afdb8b6a1229976c0ce5b9b 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -54,7 +54,8 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 #files with the "stop on warning" barrier.
 libwireshark_la_SOURCES = \
        $(LIBWIRESHARK_SRC)     \
-       $(LIBWIRESHARK_INCLUDES)
+       $(LIBWIRESHARK_INCLUDES)        \
+       ws_version_info.c
 
 libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
 
@@ -104,7 +105,8 @@ CLEANFILES = \
 DISTCLEANFILES = \
        $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
        $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
-       dtd_grammar.out
+       dtd_grammar.out \
+       ws_version_info.c
 
 MAINTAINERCLEANFILES = \
        $(LIBWIRESHARK_GENERATED_C_FILES) \
@@ -113,7 +115,8 @@ MAINTAINERCLEANFILES = \
 
 BUILT_SOURCES = \
        $(LIBWIRESHARK_GENERATED_HEADER_FILES) \
-       $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES)
+       $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
+       ws_version_info.c
 
 #
 # Add the object files for missing routines, if any.
@@ -194,6 +197,9 @@ dtd_grammar.h: dtd_grammar.c
 dtd_grammar.c : $(LEMON) $(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon
        $(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon
 
+ws_version_info.c: $(top_srcdir)/ws_version_info.c
+       $(LN_S) $<
+
 tvbtest.o exntest.o oids_test.o: exceptions.h
 
 update-sminmpec:

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 29df42fc27fedbf1287816297554497758e696a3..8801e9d2ed99059c10306137e95549f263debf9b 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -47,7 +47,7 @@
 #include <wsutil/str_util.h>
 #include <wsutil/report_err.h>
 #include <wsutil/pint.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include "packet-x509af.h"
 #include "packet-x509if.h"
 #include "packet-ssl-utils.h"

diff --git a/epan/print.c b/epan/print.c
index 4af1acb102b7358d794b90046582d7b95e66d488..566af2ee2b60b4fb5a64437a61a2475bcb5ff753 100644 (file)
--- a/epan/print.c
+++ b/epan/print.c
@@ -36,7 +36,7 @@
 #include <epan/print.h>
 #include <epan/charsets.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include <wsutil/utf8_entities.h>
 #include <ftypes/ftypes-int.h>
 

diff --git a/file.c b/file.c
index 04fd8becc9bc041520831b43e1954546c6a20018..75a11d45406e7264cc0e28e133c4ef319bb15695 100644 (file)
--- a/file.c
+++ b/file.c
@@ -33,7 +33,7 @@
 #include <wsutil/tempfile.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include <wiretap/merge.h>
 

diff --git a/mergecap.c b/mergecap.c
index 76edfa4f6379f17d123ea9cafcdf084d2806a280..55ed977f955fcac8976d1fb33ac6934aa6241231 100644 (file)
--- a/mergecap.c
+++ b/mergecap.c
@@ -49,7 +49,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/strnatcmp.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>

diff --git a/rawshark.c b/rawshark.c
index c771698309195b7ce9cdf2a4943d6d7996a5d7cb..df8185ce55d0861e270ba30a49de56ab63ddfaac 100644 (file)
--- a/rawshark.c
+++ b/rawshark.c
@@ -92,7 +92,7 @@
 #include <wiretap/pcap-encap.h>
 
 #include <wsutil/clopts_common.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include "caputils/capture-pcap-util.h"
 

diff --git a/reordercap.c b/reordercap.c
index 1627024a56635563bf1254e5c231664904b10c78..2bcc77ac121a912e7c71328b990658352f44644c 100644 (file)
--- a/reordercap.c
+++ b/reordercap.c
@@ -42,7 +42,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include <wiretap/wtap_opttypes.h>
 
 #ifdef HAVE_PLUGINS

diff --git a/text2pcap.c b/text2pcap.c
index 65f4a8526e1bcd4d961e24148e42b0dbdd2c1132..d364984d62f1ebb6d76c92c1aaae8eba3234aa9a 100644 (file)
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -112,7 +112,7 @@
 #include <string.h>
 #include <wsutil/file_util.h>
 #include <wsutil/crash_info.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 #include <wsutil/inet_addr.h>
 
 #include <time.h>

diff --git a/tfshark.c b/tfshark.c
index 3f0073eae657acbc78fcb78d678fe868b3788b5b..ae267614e636ee8f540e14bb30f1ad2b6bbef135 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -52,7 +52,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 "globals.h"
 #include <epan/timestamp.h>

diff --git a/tshark.c b/tshark.c
index c97945f12f58272dff5d7c7490abfac9e0a60cb3..0bd08b6d9c899d4349c732ed6fb09c7a238df496 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -61,7 +61,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/wtap_opttypes.h>
 #include <wiretap/pcapng.h>
 

diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index 61a9dc174e46c0abd6b68d82d15ad91800204e12..ce66fd2ecfd6aa52775863a53363dc73d1f71c9f 100644 (file)
--- 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 579d3edf0593429dc429f5d40d2aa2df43d990e0..06c1d9a70bb7c8e7084d717afde0d0c64398073b 100644 (file)
--- 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 e901b7bd07cd578abc1474928ebde06c33b7c9cc..5a5816fd273eb42a4d1e21c082891270737afe4c 100644 (file)
--- 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 183453fb1d15eee8cbad1576751c94b7fecc40dd..37482e2e02631f923d3b06d02556b319090c42c3 100644 (file)
--- 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 2c1c564b5610be4662c2da2c1f79b8eb80f48f3b..71a4d8e15d43086993c9f526cbd8b02691fbb897 100644 (file)
--- 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 e1728d48a36f0deeaad27feedf4693971216bf93..b180b79ca29056f6e78be5e8b87ef44d9666a2a6 100644 (file)
--- 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 b22ae2b362f03329d2b1f634e216dab1a7b41918..696446f7b449b09d6c2a9a402f6d751d1ce1bc2d 100644 (file)
--- 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 84d8f9a1e4d9f9adf2c97a5267570f2999376fa6..7c52b49dd57c566764748c9d7b6b6889cba55d00 100644 (file)
--- 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 8752e385f36bc032ccabffcddfb7b4e1d131ed10..733fc55eceaad08a8e3f2ccde84be5f4f4e8c23a 100644 (file)
--- 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 5473a838f49a051ca0e726745367f2089de3cedc..2d0ff87e60bccd2d89389f3651e9e86e7527dd39 100644 (file)
--- 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 9f04263571ec33b143de87428806873ff8285da1..443d10b0e97ea9b324af74e21cd2a45fd49f9f44 100644 (file)
--- 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 691a457b6bee47c4d72536ba40709da0e877c9b4..b5cb3dc87868979058bfc0519f437dc18b0064f2 100644 (file)
--- 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 4b37a5ffed62d55b7f262e866661469c67fce659..da39acaaa3d5cc4be6ab7f9e9f95a91bc9902e58 100644 (file)
--- 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 e0b2a9fc3c36050e91425133c5f45a30ccc4f3bf..608e4a1acb4dc78072b0ab40eec9fe05ae15f1d9 100644 (file)
--- 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>

diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 9b45ec6371c0a06aad4b235b04eef625da813aa5..5f038aeaa19d385452eafeb5d896abeecd8e21c2 100644 (file)
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -45,7 +45,7 @@
 #endif
 #include <wsutil/report_err.h>
 #include <wsutil/unicode-utils.h>
-#include <wsutil/ws_version_info.h>
+#include <ws_version_info.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/ex-opt.h>

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 883106a58cc4313cfa05f81dbdac2267227fc999..72b2d0daec6e4a300a4abd70c2f0aee0b2fb4698 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -81,6 +81,7 @@ set(WIRETAP_FILES
        vwr.c
        wtap.c
        wtap_opttypes.c
+       ${CMAKE_SOURCE_DIR}/ws_version_info.c
 )
 
 if (WERROR_COMMON_FLAGS)

diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 597e77d27b7ab286b281d3266f7df4434d96a767..6414645942339974f1c0fd390f5715ae155916e1 100644 (file)
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -36,6 +36,9 @@ CLEANFILES = \
        libwiretap_generated.la \
        *~
 
+DISTCLEANFILES = \
+       ws_version_info.c
+
 MAINTAINERCLEANFILES = \
        $(GENERATED_FILES)      \
        Makefile.in
@@ -46,14 +49,15 @@ MAINTAINERCLEANFILES = \
 #files with the "stop on warning" barrier.
 libwiretap_la_SOURCES = \
        $(NONGENERATED_C_FILES) \
-       $(NONGENERATED_HEADER_FILES)
+       $(NONGENERATED_HEADER_FILES)    \
+       ws_version_info.c
 
 libwiretap_generated_la_SOURCES = \
        $(GENERATED_C_FILES)
 
 libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
-BUILT_SOURCES = $(GENERATED_HEADER_FILES)
+BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c
 
 EXTRA_DIST = \
        .editorconfig           \
@@ -82,6 +86,9 @@ ascend.c: $(srcdir)/ascend.y ascend_scanner_lex.h
        fi
        $(AM_V_YACC)$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y
 
+ws_version_info.c: $(top_srcdir)/ws_version_info.c
+       $(LN_S) $<
+
 # ABI compliance checker can be obtained from
 # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
 # Checked using version 1.21.12

diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index 1b388b3b15d44dd9ee60ec7b3322d894b970cf6a..a93ff1d9ac034f449f8504e56f29877c4cca6864 100644 (file)
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -42,7 +42,7 @@
 #include <wsutil/buffer.h>
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
 #include "wsutil/str_util.h"
 
 

diff --git a/wsutil/ws_version_info.c b/ws_version_info.c
similarity index 99%
rename from wsutil/ws_version_info.c
rename to ws_version_info.c
index 84c2edd06ca3db0c19e6e1f7124d0a8593ac5f12..944a5798a00801717516391d441ba858ce20be4d 100644 (file)
--- a/wsutil/ws_version_info.c
+++ b/ws_version_info.c
@@ -39,7 +39,7 @@
 
 #include "version.h"
 
-#include <wsutil/ws_version_info.h>
+#include "ws_version_info.h"
 
 #include <wsutil/ws_cpuid.h>
 #include <wsutil/copyright_info.h>

diff --git a/wsutil/ws_version_info.h b/ws_version_info.h
similarity index 82%
rename from wsutil/ws_version_info.h
rename to ws_version_info.h
index b2cf6b3b6c75fa82c7e32dd4ad60e7cdc39907d9..ec5b1da6212bc45080753b32297ed300bbc52756 100644 (file)
--- a/wsutil/ws_version_info.h
+++ b/ws_version_info.h
@@ -21,10 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __WSUTIL_WS_VERSION_INFO_H__
-#define __WSUTIL_WS_VERSION_INFO_H__
+#ifndef __WS_VERSION_INFO_H__
+#define __WS_VERSION_INFO_H__
 
-#include "ws_symbol_export.h"
+#include <glib.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,7 +43,7 @@ extern "C" {
  * at the end of the string, as we currently don't use Portaudio in
  * TShark.
  */
-WS_DLL_PUBLIC GString *get_compiled_version_info(void (*prepend_info)(GString *),
+GString *get_compiled_version_info(void (*prepend_info)(GString *),
                                                  void (*append_info)(GString *));
 
 /*
@@ -55,19 +55,19 @@ WS_DLL_PUBLIC GString *get_compiled_version_info(void (*prepend_info)(GString *)
  * Portaudio information at the end of the string, as we currently
  * don't use Portaudio in TShark.
  */
-WS_DLL_PUBLIC GString *get_runtime_version_info(void (*additional_info)(GString *));
+GString *get_runtime_version_info(void (*additional_info)(GString *));
 
-WS_DLL_PUBLIC void show_version(const gchar *prog_name, GString *comp_info_str, GString *runtime_info_str);
+void show_version(const gchar *prog_name, GString *comp_info_str, GString *runtime_info_str);
 
 /*
  * Return a version number string for Wireshark, including, for builds
  * from a tree checked out from Wireshark's version control system,
  * something identifying what version was checked out.
  */
-WS_DLL_PUBLIC const char *get_ws_vcs_version_info(void);
+const char *get_ws_vcs_version_info(void);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __WSUTIL_WS_VERSION_INFO_H__ */
+#endif /* __WS_VERSION_INFO_H__ */

diff --git a/wsutil/.editorconfig b/wsutil/.editorconfig
index dc741c0777b619cac202ac57a68c9b9269fa0b78..f7f11b64f52e53c277643a2605fe5d1cbf607b5d 100644 (file)
--- a/wsutil/.editorconfig
+++ b/wsutil/.editorconfig
@@ -132,9 +132,5 @@ indent_size = tab
 [ws_mempbrk_sse42.[ch]]
 indent_size = 2
 
-[ws_version_info.[ch]]
-indent_style = tab
-indent_size = tab
-
 [wsgetopt.[ch]]
 indent_size = 2

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 9eeda808bca11a4cc781d32a324209af21653ea0..209787a6587c0e51560e3f59ca1377b3da5f5f58 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -75,7 +75,6 @@ set(WSUTIL_FILES
        type_util.c
        unicode-utils.c
        ws_mempbrk.c
-       ws_version_info.c
        ${WSUTIL_PLATFORM_FILES}
 )
 

diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 9f96db7f432c62677d76e1f78e3b7ca57997f410..4913be54fd7d8189c08a9fa7492064cd2ebb305b 100644 (file)
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -71,8 +71,7 @@ LIBWSUTIL_COMMON_SRC = \
        time_util.c     \
        type_util.c     \
        unicode-utils.c \
-       ws_mempbrk.c    \
-       ws_version_info.c
+       ws_mempbrk.c
 
 # Header files that don't declare replacement functions for functions
 # present in the APIs/ABIs of some, but not all, targets.
@@ -129,8 +128,7 @@ libwsutil_nonrepl_INCLUDES = \
        utf8_entities.h \
        ws_cpuid.h      \
        ws_mempbrk.h    \
-       ws_mempbrk_int.h \
-       ws_version_info.h
+       ws_mempbrk_int.h
 
 # Header files that are not generated from other files
 LIBWSUTIL_COMMON_INCLUDES = \

diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 015aab89a017df0cdda624b7641e00d2fc916f62..36d06523e46993c308f6524d16bedce128031563 100644 (file)
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -31,7 +31,8 @@ OBJECTS = file_util.obj               \
        $(LIBWSUTIL_SRC:.c=.obj) \
        popcount.obj             \
        strptime.obj            \
-       ws_mempbrk_sse42.obj
+       ws_mempbrk_sse42.obj    \
+       ..\ws_version_info.obj
 
 # For use when making libwsutil.dll
 libwsutil.lib: libwsutil.dll
@@ -50,7 +51,7 @@ libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res
 # The following target will rebuild its obj
 # if and when version.h should change.
 #
-ws_version_info.obj: ..\version.h
+..\ws_version_info.obj: ..\version.h
 
 clean:
        rm -f $(OBJECTS) \