Move the contents of airpdcap to epan/crypt. Try to fix the current

distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231

1 files changed, 21 insertions, 9 deletions

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index ab9b44f6d3..bf5ccf57d3 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -37,6 +37,7 @@ libwireshark_LIBS = \
 	$(LUA_LIBS) \
 	..\wiretap\wiretap-$(WTAP_VERSION).lib \
 	$(ICONV_DIR)\lib\iconv.lib \
+	crypt\airpdcap.lib \
 	ftypes\ftypes.lib \
 	dfilter\dfilter.lib \
 	$(WSLUA_LIB) \
@@ -61,17 +62,17 @@ DOXYGEN_DEP=doxygen
 !ENDIF
 
 !IFDEF ENABLE_LIBWIRESHARK
-all: ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.dll
+all: crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.dll
 !ELSE
-all: ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.lib
+all: 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 ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
-                 ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) ..\image\libwireshark.res
+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
 	@echo Linking libwireshark.dll
 	$(link) $(dlllflags) $(conlibsdll) \
 		$(LOCAL_LDFLAGS) \
@@ -81,8 +82,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes df
 		dissectors\register.obj \
 		$(EXTRA_OBJECTS)
 
-libwireshark.lib	: ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
-                  ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib
+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
 	link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \
 		$(EXTRA_OBJECTS)
 
@@ -94,7 +95,9 @@ libwireshark.lib	: ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter $(WSLUA_DI
 clean:
 	rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) libwireshark.lib libwireshark.dll libwireshark.lib libwireshark.exp $(PDB_FILE) doxygen.cfg html/*.*
 	if exist html rmdir html	
-	cd ftypes
+	cd crypt
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../ftypes
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../dfilter
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
@@ -117,7 +120,9 @@ distclean: clean
 	rm -f config.h register.c mkstemp.c strptime.c radius_dict.c \
 		dtd_grammar.out	dtd_grammar.c dtd_grammar.h dtd_parse.c \
 		dtd_preparse.c
-	cd ftypes
+	cd crypt
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../ftypes
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../dfilter
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
@@ -128,7 +133,9 @@ distclean: clean
 	cd ..
 
 maintainer-clean: distclean
-	cd ftypes
+	cd crypt
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+	cd ../ftypes
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../dfilter
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
@@ -138,6 +145,11 @@ maintainer-clean: distclean
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ..
 
+crypt:: ..\config.h
+	cd crypt
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+	cd ..
+
 ftypes:: ..\config.h
 	cd ftypes
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake