Handle PORTAUDIO_API_1 and add clean-deps target to distclean.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19159 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index 6b2002634a5331dbfc3dd045eb97d7844b5b87c0..aca12f609bcf24c278351c9edfd0c11b3ff76758 100644 (file)
--- a/Makefile.nmake
+++ b/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

diff --git a/config.h.win32 b/config.h.win32
index 9871ee6e0a523e36692bf2f06a43e339f33959f4..9e52bc159ad22c834cccb269dc1eb73357b796e6 100644 (file)
--- a/config.h.win32
+++ b/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

diff --git a/config.nmake b/config.nmake
index 51ddb137e7eb233ff2814d8154a92d9629ba8cb6..8f5d0410b7ae25bb66d905679b5028f78deef39a 100644 (file)
--- a/config.nmake
+++ b/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