Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.

[debian/gnuradio] / gr-audio-windows / src / Makefile.am

diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index 2f5c26c6a88da6ea52d665f48e4b57410cad2126..8618dd54999c00d70acc30430888b82e7e67146d 100644 (file)
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-audio-windows/src/audio_windows.i                              
+       $(srcdir)/audio_windows.i                               
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -50,9 +50,6 @@ ourpython_PYTHON =                    \
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-        $(WITH_SWIG_INCLUDES)
-
 ourlib_LTLIBRARIES = _audio_windows.la
 
 _audio_windows_la_SOURCES =            \
@@ -79,9 +76,9 @@ _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
 
 _audio_windows_la_CXXFLAGS = @swig_CXXFLAGS@
 
-audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc $(LOCAL_IFILES)
-
+audio_windows.cc audio_windows.py: $(ALL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_windows \
+               -o audio_windows.cc $(LOCAL_IFILES)
 
 noinst_PYTHON = qa_audio_windows.py