Setting wireshark_LINK means that wireshark_LDFLAGS isn't used; there's

no need to set it for the GTK+ version, so don't.  (For Qt, we should
find some other way of forcing it to link wireshark-qt as a C++ program,
perhaps by having a wireshark-qt.cpp file in the top-level source
directory that contains main() and that calls the ui/qt code.)

svn path=/trunk/; revision=50544

diff --git a/Makefile.am b/Makefile.am
index ec780ada6f69a27b794dcb6cbbe152def6a876ac..dce0f511ea42ccda060d90289f0590c62fbfc38f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -395,7 +395,6 @@ wireshark_SOURCES = $(WIRESHARK_COMMON_SRC)
 wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
 wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 wireshark_LDADD = ui/gtk/libgtkui.a $(wireshark_ldadd) @GTK_LIBS@
-wireshark_LINK = $(LINK)
 endif
 
 # Ideally we could trigger automatic c++ linking here with