aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.am
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-03-18 21:59:30 +0000
committerGerald Combs <gerald@wireshark.org>2009-03-18 21:59:30 +0000
commitdd903ca9c8434f68f01c2affbe7fef4b05ba07d4 (patch)
tree1ad1bf485828e29deedc3571b0d9b00b10e1fc08 /epan/Makefile.am
parentcf536e062b5ac17b4f91a8fe706fd1dfb62622ea (diff)
Create an "epan/crc" directory for CRC code. Add crc-16-plain.[ch],
generated from pycrc. The command line used to generate the file is in epan/crc/Makefile.common. I used "plain" to distinguish it from CCITT, USB, and other 16-bit CRCs. Integrate the new CRC code into our infrastructure. Add crc16_plain_tvb_offset() to epan/crc16.[ch] and use it in plugins/profinet/packet-pn-rt.c. This _should_ work correctly, but hasn't been tested. svn path=/trunk/; revision=27790
Diffstat (limited to 'epan/Makefile.am')
-rw-r--r--epan/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index f9f43e452c..8e93076d8f 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -35,7 +35,7 @@ wslua_dist_dir = wslua
endif # HAVE_LIBLUA
-SUBDIRS = crypt ftypes dfilter dissectors $(wslua_dir)
+SUBDIRS = crc crypt ftypes dfilter dissectors $(wslua_dir)
DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
@@ -125,8 +125,8 @@ MAINTAINERCLEANFILES = \
#
libwireshark_la_LIBADD = \
@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
- libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
- dfilter/libdfilter.la dissectors/libdissectors.la \
+ libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
+ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
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@ \
@@ -134,8 +134,8 @@ libwireshark_la_LIBADD = \
libwireshark_la_DEPENDENCIES = \
@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
- libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
- dfilter/libdfilter.la dissectors/libdissectors.la \
+ 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