summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-01-25 15:06:42 +0100
committerPeter Wu <peter@lekensteyn.nl>2017-01-25 15:19:03 +0000
commit53c7f0a25ee5b1419c1a87045e25ca11ec12f9b1 (patch)
treeb8d32d033c88a0c67e568d83fc7d723d0c248e1d
parentbceb614d15126f3903839c789875745548730015 (diff)
downloadwireshark-53c7f0a25ee5b1419c1a87045e25ca11ec12f9b1.tar.gz
CMake,autotools: remove unneeded files, fixes build
sharkd does not perform any capturing, so do not include related libraries and files. This fixes the CMake build too. Change-Id: Ie002b09dbf60070e34dacc8ae7dadee6690d4db8 Reviewed-on: https://code.wireshark.org/review/19786 Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--CMakeLists.txt1
-rw-r--r--Makefile.am2
2 files changed, 0 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 407012473a..bfa36d8d54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2298,7 +2298,6 @@ if(BUILD_sharkd)
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(sharkd_FILES
- capture_opts.c
filter_files.c
sharkd.c
sharkd_daemon.c
diff --git a/Makefile.am b/Makefile.am
index 0518b2a951..10eea0cf97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -593,8 +593,6 @@ sharkd_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
# Libraries and plugin flags with which to link sharkd.
sharkd_LDADD = \
- capchild/libcapchild.a \
- caputils/libcaputils.a \
ui/cli/libcliui.a \
ui/libui.a \
wiretap/libwiretap.la \