|
Line
Link Here
|
| 0 |
-- wireshark-1.8.0/Makefile.am |
0 |
++ wireshark-1.8.0/Makefile.am |
|
Lines 307-317
Link Here
|
| 307 |
|
307 |
|
| 308 |
# Libraries and plugin flags with which to link wireshark. |
308 |
# Libraries and plugin flags with which to link wireshark. |
| 309 |
# |
309 |
# |
| 310 |
# Note that Wireshark doesn't have to be linked with @GLIB_LIBS@, as |
310 |
# @GTK_LIBS@ has most of @GLIB_LIBS@ but misses gmodule, which we use. |
| 311 |
# they are included in @GTK_LIBS@, and doesn't have to be linked with |
311 |
# Wireshark doesn't have to be linked with @SOCKET_LIBS@ or |
| 312 |
# @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in |
312 |
# @NSL_LIBS@, as those should also be included in @GTK_LIBS@ (as those |
| 313 |
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+ |
313 |
# are also needed for X applications, and GTK+ applications are X |
| 314 |
# applications are X applications). |
314 |
# applications). |
| 315 |
wireshark_LDADD = \ |
315 |
wireshark_LDADD = \ |
| 316 |
ui/gtk/libgtkui.a \ |
316 |
ui/gtk/libgtkui.a \ |
| 317 |
ui/gtk/libgtkui_dirty.a \ |
317 |
ui/gtk/libgtkui_dirty.a \ |
|
Lines 333-338
Link Here
|
| 333 |
@LIBGNUTLS_LIBS@ \ |
333 |
@LIBGNUTLS_LIBS@ \ |
| 334 |
@LIBSMI_LDFLAGS@ \ |
334 |
@LIBSMI_LDFLAGS@ \ |
| 335 |
@PORTAUDIO_LIBS@ \ |
335 |
@PORTAUDIO_LIBS@ \ |
|
|
336 |
@GLIB_LIBS@ \ |
| 336 |
@GTK_LIBS@ -lm |
337 |
@GTK_LIBS@ -lm |
| 337 |
|
338 |
|
| 338 |
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) |
339 |
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) |
