diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-18 17:31:09 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-03-21 17:10:21 +0000 |
commit | 52dd4fb6330a10ed37b8e221c502b5a98de4f581 (patch) | |
tree | 9d3ea5b26003115f61ac5af0d9dd7997cbe7cfb2 /Makefile.common | |
parent | 69d348c12a2d86e5fa75189cd2dd5f4f3784dcfc (diff) |
Fix building without extcap enabled
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.
Some documentation fixes too.
Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
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 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index a9fa08e269..06236d09d0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -40,19 +40,23 @@ GENERATED_C_FILES = # All the generated files. GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) +EXTCAP_COMMON_SRC = \ + extcap.c \ + extcap_parser.c + +EXTCAP_COMMON_INCLUDES = \ + extcap.h \ + extcap_parser.h + # sources common for wireshark, tshark, and rawshark SHARK_COMMON_SRC = \ cfile.c \ frame_tvbuff.c \ - sync_pipe_write.c \ - extcap.c \ - extcap_parser.c + sync_pipe_write.c # corresponding headers SHARK_COMMON_INCLUDES = \ cfile.h \ - extcap.h \ - extcap_parser.h \ file.h \ fileset.h \ frame_tvbuff.h \ @@ -166,5 +170,6 @@ dumpcap_INCLUDES = \ # this target needed for distribution only noinst_HEADERS = \ $(SHARK_COMMON_INCLUDES) \ + $(EXTCAP_COMMON_INCLUDES) \ $(WIRESHARK_COMMON_INCLUDES) \ $(dumpcap_INCLUDES) |