diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-30 14:17:40 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-30 14:17:40 +0000 |
| commit | b2c7a7d2bd3569d6dded5f11d4a234321fc1c422 (patch) | |
| tree | f39d52e05bd3785b6e26c6bda1d4d89f4f4e48cb /epan/Makefile.nmake | |
| parent | 6fb0f70394696f2f19c21172b34756928700675f (diff) | |
Revert r38800, as the crc routines contains some tvb functions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38803 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 8d9cf96324..4efc7924cc 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -52,6 +52,7 @@ libwireshark_LIBS = \ $(GEOIP_LIBS) \ ..\wsutil\libwsutil.lib \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ + crc\crc.lib \ crypt\airpdcap.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ @@ -76,17 +77,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors libwireshark.dll +all: crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors libwireshark.dll !ELSE -all: crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors libwireshark.lib +all: crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_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) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) $(WSPYTHON_LIB) ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) $(WSPYTHON_LIB) ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ @@ -96,8 +97,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) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) $(WSPYTHON_LIB) dissectors\dissectors.lib +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) $(WSPYTHON_LIB) dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -114,6 +115,8 @@ clean-local: if exist html rm -rf html clean: clean-local + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../ftypes @@ -146,6 +149,8 @@ distclean-local: clean-local dtd_grammar.out sminmpec.c distclean: distclean-local + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../ftypes @@ -163,6 +168,8 @@ distclean: distclean-local maintainer-clean-local: distclean-local maintainer-clean: maintainer-clean-local + cd crc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../ftypes @@ -177,6 +184,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 |