aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-02-19 00:19:35 +0000
committerGuy Harris <guy@alum.mit.edu>2012-02-19 00:19:35 +0000
commit89a5b93d98b7e90a4d0711a29270fbef2d91db4b (patch)
tree2aea25d24206a56c396d13f8e7f3d0144b88a487 /Makefile.am
parent7d16d51f0f338d67d38ff23fe8b5b8f0a3839934 (diff)
ui/gtk/main.c calls get_conn_cfilter(), which is defined in ui/util.c,
so we need to link libui *after* libgtkui. (It worked on Mac OS X, but the OS X linker might do things differently from the GNU linker.) svn path=/trunk/; revision=41063
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 b4648fda78..a0fefb62f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -386,9 +386,9 @@ endif
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+
# applications are X applications).
wireshark_LDADD = \
- ui/libui.a \
ui/gtk/libgtkui.a \
ui/gtk/libgtkui_dirty.a \
+ ui/libui.a \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \