osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Automake can, at times, be a delicate fragile flower. Apparently, 

having something in wireshark_LDADD that's filled in by the configure
script means that the items referred to by that string aren't treated as
dependencies.

svn path=/trunk/; revision=41709
This commit is contained in:
Guy Harris 2012-03-21 06:13:53 +00:00
parent 40a034b3f5
commit fd72ad5e92
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.am
View File

@ -339,21 +339,6 @@ else
wireshark_LDFLAGS = -export-dynamic
endif
#
# UI code for Wireshark with Qt.
#
wireshark_QT_UI_LIBS = \
ui/qt/libqtui.a \
@Qt_LIBS@
#
# UI code for Wireshark with GTK+.
#
wireshark_GTK_UI_LIBS = \
ui/gtk/libgtkui.a \
ui/gtk/libgtkui_dirty.a \
@GTK_LIBS@ -lm
# Libraries and plugin flags with which to link wireshark.
#
# Note that Wireshark doesn't have to be linked with @GLIB_LIBS@, as
@ -362,7 +347,8 @@ wireshark_GTK_UI_LIBS = \
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+
# applications are X applications).
wireshark_LDADD = \
@UI_LIBS@ \
ui/gtk/libgtkui.a \
ui/gtk/libgtkui_dirty.a \
ui/libui.a \
codecs/libcodec.a \
wiretap/libwiretap.la \
@ -380,7 +366,9 @@ wireshark_LDADD = \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
@PORTAUDIO_LIBS@
@PORTAUDIO_LIBS@ \
@GTK_LIBS@ -lm
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
if ENABLE_STATIC

4
configure.in
View File

@ -819,7 +819,6 @@ if test "x$enable_wireshark" = "xyes"; then
# compile.
#
CPPFLAGS="-DQT_GUI_LIB $CPPFLAGS"
UI_LIBS='$(wireshark_QT_UI_LIBS)'
have_qt=yes
],
[
@ -842,7 +841,6 @@ if test "x$enable_wireshark" = "xyes"; then
CFLAGS="$CFLAGS $GTK_CFLAGS"
CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
have_gtk=yes
UI_LIBS='$(wireshark_GTK_UI_LIBS)'
AC_DEFINE(HAVE_GTK, 1,
[Define to 1 if compiling with GTK])
], have_gtk=no)
@ -853,7 +851,6 @@ if test "x$enable_wireshark" = "xyes"; then
CFLAGS="$CFLAGS $GTK_CFLAGS"
CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
have_gtk=yes
UI_LIBS='$(wireshark_GTK_UI_LIBS)'
AC_DEFINE(HAVE_GTK, 1,
[Define to 1 if compiling with GTK])
], have_gtk=no)
@ -863,7 +860,6 @@ else
have_qt=no
have_gtk=no
fi
AC_SUBST(UI_LIBS)
# GLib checks; we require GLib 2.14 or later, and require gmodule
# support, as we need that for dynamically loading plugins.