diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-03-18 21:59:30 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-03-18 21:59:30 +0000 |
| commit | dd903ca9c8434f68f01c2affbe7fef4b05ba07d4 (patch) | |
| tree | 1ad1bf485828e29deedc3571b0d9b00b10e1fc08 /epan/Makefile.nmake | |
| parent | cf536e062b5ac17b4f91a8fe706fd1dfb62622ea (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.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index fe0c1cd2ab..daa8ae61c1 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -44,6 +44,7 @@ libwireshark_LIBS = \ !IFDEF ICONV_DIR $(ICONV_DIR)\lib\iconv.lib \ !ENDIF + crc\crc.lib \ crypt\airpdcap.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ @@ -75,17 +76,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.dll +all: crc crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.dll !ELSE -all: crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.lib +all: crc crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.lib !ENDIF # For use when making libwireshark.dll libwireshark.lib: libwireshark.dll libwireshark.exp: libwireshark.dll -libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crc crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ @@ -95,8 +96,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crypt fty dissectors\register.obj \ $(EXTRA_OBJECTS) -libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crc crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -113,7 +114,9 @@ clean-local: if exist html rmdir html clean: clean-local - cd crypt + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean @@ -144,7 +147,9 @@ distclean-local: clean-local dtd_grammar.out sminmpec.c distclean: distclean-local - cd crypt + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean @@ -159,7 +164,9 @@ distclean: distclean-local maintainer-clean-local: distclean-local maintainer-clean: maintainer-clean-local - cd crypt + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean @@ -171,6 +178,11 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd .. +crc:: ..\config.h + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + crypt:: ..\config.h cd crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake |