summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-01 03:28:48 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-01 11:29:36 +0000
commit0a64b55971fe025219b03d0da9f58efdd20e6f8c (patch)
tree470e43370fc25ffcd7198a9af6d97e779d6ced31 /Makefile.am
parent8bf7078f7929d45c004372998aa3a87c05d43671 (diff)
downloadwireshark-0a64b55971fe025219b03d0da9f58efdd20e6f8c.tar.gz
Remove wireshark_cxx.
It may have been part of the "build Qt Wireshark as C++" hacks, and is now causing build problems. Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c Reviewed-on: https://code.wireshark.org/review/6200 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 3f03ffbaf8..61b6e3708d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ bin_PROGRAMS = \
EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype editcap \
mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \
- wireshark_cxx echld_test
+ echld_test
#
# Wireshark configuration files are put in $(pkgdatadir).