Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from

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

diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index cf024c263111d1ebeb4cb2e872cd7bd4a6d38827..9b59adbb4dc760991e28ea9d15288bd7cf299435 100644 (file)
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-LIBS += $(GNURADIO_CORE_LIBS)
-
 # Install this stuff so that it ends up as the gnuradio.audio_portaudio module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -38,14 +36,14 @@ LOCAL_IFILES =                              \
        audio_portaudio.i                               
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
        $(NON_LOCAL_IFILES)             
 
 BUILT_SOURCES =                        \
-       audio_portaudio.cc                      \
+       audio_portaudio.cc              \
        audio_portaudio.py                              
 
 ourpython_PYTHON =                     \
@@ -77,6 +75,7 @@ swiginclude_HEADERS =                         \
 
 _audio_portaudio_la_LIBADD =           \
        $(PYTHON_LDFLAGS)               \
+       $(GNURADIO_CORE_LIBS)           \
        $(PORTAUDIO_LIBS)               \
        -lstdc++