From 71f903b956ff151f553b791bb43a52959a8be983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Tue, 30 Aug 2011 14:17:40 +0000 Subject: Revert r38800, as the crc routines contains some tvb functions. svn path=/trunk/; revision=38803 --- epan/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/Makefile.am') diff --git a/epan/Makefile.am b/epan/Makefile.am index d624c49c01..a0a224b64e 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -46,7 +46,7 @@ wspython_dist_dir = wspython py_dissectors_dir = -DPYTHONDIR= endif -SUBDIRS = crypt ftypes dfilter dissectors $(wslua_dir) $(wspython_dir) +SUBDIRS = crc crypt ftypes dfilter dissectors $(wslua_dir) $(wspython_dir) DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) $(wspython_dist_dir) @@ -133,7 +133,7 @@ MAINTAINERCLEANFILES = \ # libwireshark_la_LIBADD = \ libwireshark_generated.la \ - libwireshark_asmopt.la crypt/libairpdcap.la \ + libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ @@ -143,7 +143,7 @@ libwireshark_la_LIBADD = \ libwireshark_la_DEPENDENCIES = \ libwireshark_generated.la \ - libwireshark_asmopt.la crypt/libairpdcap.la \ + libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) \ ${top_builddir}/wsutil/libwsutil.la \ -- cgit v1.2.3