Handle PORTAUDIO_API_1 and add clean-deps target to distclean.

svn path=/trunk/; revision=19159

Makefile.nmake

@@ -238,6 +238,7 @@ config.h	: config.h.win32 config.nmake
 	    -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \
 	    -e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \
 	    -e "s/@HAVE_PORTAUDIO@/$(PORTAUDIO_CONFIG)/" \
+	    -e "s/@HAVE_PORTAUDIO_API@/$(PORTAUDIO_API_CONFIG)/" \
 	    < config.h.win32 > $@
 
 ps.c	: rdps.exe print.ps
@@ -326,7 +327,7 @@ clean: gtk2_distclean
 
 # "distclean" removes all files not part of the distribution.
 # It does not remove generated files that are part of the distribution.
-distclean: clean gtk2_distclean
+distclean: clean gtk2_distclean clean-deps
 	rm -f config.h $(BUILT_SOURCES)
 	cd wiretap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean

config.h.win32

@@ -222,6 +222,8 @@
 
 /* Define to use Portaudio library */
 @HAVE_PORTAUDIO@
+/* Define  version of of the Portaudio library API */
+@HAVE_PORTAUDIO_API@
 
 #ifndef WIN32
 #define WIN32			1

config.nmake

@@ -207,7 +207,9 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
 # If you don't have PORTAUDIO, comment this line out, so that 
 # PORTAUDIO_DIR isn't defined.
 #
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
+PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1
+
 
 #
 # Mandatory for GTK >= 2: Iconv