summaryrefslogtreecommitdiff
path: root/gr-audio-windows/src
diff options
context:
space:
mode:
authorjcorgan2009-02-02 14:27:28 +0000
committerjcorgan2009-02-02 14:27:28 +0000
commit8193fd8a044a18471a6091249195d15ae6d814be (patch)
treee9b491d81ad03024280209ac677d589c841b8f98 /gr-audio-windows/src
parent09f236be864aaa3b5216eb42676eafb38d47b587 (diff)
downloadgnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz
gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2
gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip
Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-audio-windows/src')
-rw-r--r--gr-audio-windows/src/Makefile.am13
1 files changed, 5 insertions, 8 deletions
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index 2f5c26c6a..8618dd549 100644
--- 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