diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-12 22:06:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-12 22:06:54 +0000 |
| commit | 31f37c2bce349cf3455f4ccce75426ef9e198e11 (patch) | |
| tree | 011e660a8e95db9d4b7a5fc19d0189ea3a0cf655 /Makefile.am | |
| parent | 600e6683616324c299cce01144f6082e1c4702ee (diff) | |
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
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ec780ada6f..dce0f511ea 100644 --- 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 |