aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2018-02-04 10:22:58 +0000
committerJoão Valverde <j@v6e.pt>2018-02-04 16:02:51 +0000
commitad76b31c3f26ab1427920936b22ee0d8fcdc8d68 (patch)
treef23df3572216333e5a93136233e5ed110b1765c2
parent3aff56076167c5ea8fbed9eba32b0f81b6fe3aca (diff)
Don't install test programs (fuzzshark and dftest)
These binaries are not intended for end-users. Change-Id: I1e1ecd7424bbbe1b2935390e2daf7e3f1089ee28 Reviewed-on: https://code.wireshark.org/review/25594 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--CMakeLists.txt2
-rw-r--r--Makefile.am6
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f7163dd7f..7bf72577bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2572,7 +2572,6 @@ if(BUILD_dftest)
add_dependencies(dftest version)
set_extra_executable_properties(dftest "Tests")
target_link_libraries(dftest ${dftest_LIBS})
- install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_randpkt)
@@ -2610,7 +2609,6 @@ if(BUILD_fuzzshark)
add_dependencies(fuzzshark version)
set_extra_executable_properties(fuzzshark "Executables")
target_link_libraries(fuzzshark ${fuzzshark_LIBS})
- install(TARGETS fuzzshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_text2pcap)
diff --git a/Makefile.am b/Makefile.am
index 1efba7ef54..66c71e9b88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,11 +41,13 @@ bin_PROGRAMS = \
@captype_bin@ \
@editcap_bin@ \
@randpkt_bin@ \
- @dftest_bin@ \
@dumpcap_bin@ \
@reordercap_bin@ \
@rawshark_bin@ \
- @sharkd_bin@ \
+ @sharkd_bin@
+
+noinst_PROGRAMS = \
+ @dftest_bin@ \
@fuzzshark_bin@
EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \