Index: epan/Makefile.am
===================================================================
--- epan/Makefile.am.orig
+++ epan/Makefile.am
@@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \
 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
 	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
 	@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
+	${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
 	${top_builddir}/wsutil/libwsutil.la -lm
 
 libwireshark_la_DEPENDENCIES = \
@@ -137,7 +138,8 @@ libwireshark_la_DEPENDENCIES = \
 	libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
 	dissectors/libdirtydissectors.la $(wslua_lib) \
-	${top_builddir}/wsutil/libwsutil.la
+	${top_builddir}/wsutil/libwsutil.la \
+	${top_builddir}/wiretap/libwiretap.la
 
 #EXTRA_PROGRAMS = reassemble_test
 #reassemble_test_LDADD = $(GLIB_LIBS)
Index: epan/Makefile.in
===================================================================
--- epan/Makefile.in.orig
+++ epan/Makefile.in
@@ -791,6 +791,7 @@ libwireshark_la_LIBADD = \
 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
 	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
 	@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
+	${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
 	${top_builddir}/wsutil/libwsutil.la -lm
 
 libwireshark_la_DEPENDENCIES = \
@@ -798,7 +799,8 @@ libwireshark_la_DEPENDENCIES = \
 	libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
 	dissectors/libdirtydissectors.la $(wslua_lib) \
-	${top_builddir}/wsutil/libwsutil.la
+	${top_builddir}/wsutil/libwsutil.la \
+	${top_builddir}/wiretap/libwiretap.la
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 LEMON = ../tools/lemon
Index: wiretap/Makefile.am
===================================================================
--- wiretap/Makefile.am.orig
+++ wiretap/Makefile.am
@@ -68,7 +68,7 @@ EXTRA_DIST = \
 	$(GENERATOR_FILES) 	\
 	$(GENERATED_FILES)
 
-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 
Index: wiretap/Makefile.in
===================================================================
--- wiretap/Makefile.in.orig
+++ wiretap/Makefile.in
@@ -589,7 +589,7 @@ EXTRA_DIST = \
 	$(GENERATOR_FILES) 	\
 	$(GENERATED_FILES)
 
-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 all: all-am