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 /wsutil/Makefile.common | |
| 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 'wsutil/Makefile.common')
| -rw-r--r-- | wsutil/Makefile.common | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 9f96db7f43..4913be54fd 100644 --- 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 = \ |