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 /wiretap | |
| 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 'wiretap')
| -rw-r--r-- | wiretap/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 11 | ||||
| -rw-r--r-- | wiretap/nettrace_3gpp_32_423.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 883106a58c..72b2d0daec 100644 --- 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 597e77d27b..6414645942 100644 --- 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 1b388b3b15..a93ff1d9ac 100644 --- 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" |