]>
Commit | Line | Data |
---|---|---|
68082c35 SS |
1 | --- wireshark-1.0.0/epan/Makefile.am.orig 2008-04-01 05:57:15.796355855 +0200 |
2 | +++ wireshark-1.0.0/epan/Makefile.am 2008-04-01 05:59:06.288761964 +0200 | |
3 | @@ -129,15 +129,17 @@ | |
4 | libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \ | |
5 | dfilter/libdfilter.la dissectors/libcleandissectors.la \ | |
6 | dissectors/libdissectors.la dissectors/libasndissectors.la \ | |
7 | - dissectors/libpidldissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ | |
8 | + dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la \ | |
9 | + $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ | |
10 | @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ \ | |
11 | - @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm | |
12 | + @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm -lgmodule-2.0 | |
13 | libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \ | |
14 | @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \ | |
15 | libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \ | |
16 | dfilter/libdfilter.la dissectors/libcleandissectors.la \ | |
17 | dissectors/libdissectors.la dissectors/libasndissectors.la \ | |
18 | - dissectors/libpidldissectors.la $(wslua_lib) | |
19 | + dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la \ | |
20 | + $(wslua_lib) | |
4e50c0b7 | 21 | |
e43a8b87 | 22 | #EXTRA_PROGRAMS = reassemble_test |
210d4867 | 23 | #reassemble_test_LDADD = $(GLIB_LIBS) |
68082c35 SS |
24 | --- wireshark-1.0.0/wiretap/Makefile.am.orig 2008-04-01 05:56:08.300994660 +0200 |
25 | +++ wireshark-1.0.0/wiretap/Makefile.am 2008-04-01 05:56:47.298314463 +0200 | |
26 | @@ -67,7 +67,7 @@ | |
27 | $(GENERATOR_FILES) \ | |
28 | $(GENERATED_FILES) | |
29 | ||
30 | -libwiretap_la_LIBADD = libwiretap_generated.la | |
31 | +libwiretap_la_LIBADD = libwiretap_generated.la -lglib-2.0 | |
32 | libwiretap_la_DEPENDENCIES = libwiretap_generated.la | |
33 | ||
34 | RUNLEX = $(top_srcdir)/tools/runlex.sh |