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 /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 'Makefile.common')
| -rw-r--r-- | Makefile.common | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/Makefile.common b/Makefile.common index bcdc6e195a..e18ce019e4 100644 --- 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 |