diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-14 17:00:38 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-15 08:31:06 +0000 |
| commit | 58d00bad1a2c4298bd58013e4808899feb657422 (patch) | |
| tree | c609d6f4b56c9f99432f4da736797af94161952c /Makefile.common | |
| parent | 21ab9b2cbefeb73cdc605a90e8980240452567c0 (diff) | |
Build the extcap programs in the extcap directory.
That lets the version of Wireshark built with autotools find the extcap
programs.
Don't install the extcap programs under ${datadir} - that puts it under
a share directory, and share directories are for platform-independent
files, which executable images aren't (they're instruction-set
dependent, hence platform-dependent).
Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f
Reviewed-on: https://code.wireshark.org/review/13943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/Makefile.common b/Makefile.common index 0f9e7e721b..9a7b401ccd 100644 --- a/Makefile.common +++ b/Makefile.common @@ -95,19 +95,6 @@ rawshark_SOURCES = \ $(SHARK_COMMON_SRC) \ rawshark.c -# androiddump specifics -androiddump_SOURCES = \ - extcap/androiddump.c - -# sshdump specifics -sshdump_SOURCES = \ - extcap/sshdump.c - -# randpktdump specifics -randpktdump_SOURCES = \ - randpkt-core.c \ - extcap/randpktdump.c - # text2pcap specifics text2pcap_SOURCES = \ pcapio.c \ @@ -155,12 +142,7 @@ echld_test_SOURCES = \ # randpkt specifics randpkt_SOURCES = \ - randpkt.c \ - randpkt-core.c - -# corresponding headers -randpkt_INCLUDES = \ - randpkt-core.h + randpkt.c # dumpcap specifics dumpcap_SOURCES = \ @@ -184,5 +166,4 @@ dumpcap_INCLUDES = \ noinst_HEADERS = \ $(SHARK_COMMON_INCLUDES) \ $(WIRESHARK_COMMON_INCLUDES) \ - $(dumpcap_INCLUDES) \ - $(randpkt_INCLUDES) + $(dumpcap_INCLUDES) |