[Commit-gnuradio] r3204 - in gnuradio/branches/developers/jcorgan/ticket-10: . config gr-audio-portaudio/src

[jcorgan]

Author: jcorgan
Date: 2006-08-06 23:55:14 -0600 (Sun, 06 Aug 2006)
New Revision: 3204

Modified:
   
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_portaudio.m4
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/run_tests.in
Log:
gr-audio-portaudio *should* complete VPATH build, but this is not tested.


Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_portaudio.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_portaudio.m4 
    2006-08-07 05:49:09 UTC (rev 3203)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_portaudio.m4 
    2006-08-07 05:55:14 UTC (rev 3204)
@@ -28,9 +28,9 @@
 
     succeeded=yes
     PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no])
-    #AC_HAVE_LIBRARY([portaudio], [], [succeeded=no])
-    #AC_CHECK_HEADER([portaudio.h], [], [succeeded=no])
+
     if test $succeeded = yes; then
+       AC_SUBST(PORTAUDIO_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x 
gr-audio-portaudio/src/run_tests])
         subdirs="$subdirs gr-audio-portaudio"

Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
05:49:09 UTC (rev 3203)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
05:55:14 UTC (rev 3204)
@@ -154,7 +154,7 @@
 GRC_GR_AUDIO_JACK
 GRC_GR_AUDIO_OSS
 GRC_GR_AUDIO_OSX               dnl ***NOT TESTED***
-#GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
+GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
 #GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
 GRC_GR_ATSC
 #GRC_GR_COMEDI

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/Makefile.am
   2006-08-07 05:49:09 UTC (rev 3203)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/Makefile.am
   2006-08-07 05:55:14 UTC (rev 3204)
@@ -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 @@
        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 @@
 
 _audio_portaudio_la_LIBADD =           \
        $(PYTHON_LDFLAGS)               \
+       $(GNURADIO_CORE_LIBS)           \
        $(PORTAUDIO_LIBS)               \
        -lstdc++                                
 

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/run_tests.in
  2006-08-07 05:49:09 UTC (rev 3203)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-portaudio/src/run_tests.in
  2006-08-07 05:55:14 UTC (rev 3204)
@@ -18,9 +18,9 @@
 address@hidden@/gr-audio-portaudio/src
 
 # Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck.  We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH