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

[jcorgan]

Author: jcorgan
Date: 2006-08-06 23:33:42 -0600 (Sun, 06 Aug 2006)
New Revision: 3201

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_jack.m4
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/run_tests.in
Log:
gr-audio-jack now completes VPATH build.  This is also a partial fix
for ticket:18 and ticket:19.


Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_jack.m4  
2006-08-07 05:23:37 UTC (rev 3200)
+++ gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_jack.m4  
2006-08-07 05:33:42 UTC (rev 3201)
@@ -29,7 +29,7 @@
     succeeded=yes
     PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no])
     if test $succeeded = yes; then
-        LIBS="$LIBS $JACK_LIBS"
+       AC_SUBST(JACK_LIBS)
 
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x 
gr-audio-jack/src/run_tests])

Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
05:23:37 UTC (rev 3200)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
05:33:42 UTC (rev 3201)
@@ -151,7 +151,7 @@
 GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_AUDIO_ALSA
-#GRC_GR_AUDIO_JACK
+GRC_GR_AUDIO_JACK
 #GRC_GR_AUDIO_OSS
 #GRC_GR_AUDIO_OSX              dnl ***NOT TESTED***
 #GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/Makefile.am    
    2006-08-07 05:23:37 UTC (rev 3200)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/Makefile.am    
    2006-08-07 05:33:42 UTC (rev 3201)
@@ -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_jack module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -38,7 +36,7 @@
        audio_jack.i                            
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -78,6 +76,8 @@
 
 _audio_jack_la_LIBADD =                \
        $(PYTHON_LDFLAGS)               \
+       $(GNURADIO_CORE_LIBS)           \
+       $(JACK_LIBS)                    \
        -lstdc++                                
 
 _audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/run_tests.in   
    2006-08-07 05:23:37 UTC (rev 3200)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-jack/src/run_tests.in   
    2006-08-07 05:33:42 UTC (rev 3201)
@@ -18,9 +18,9 @@
 address@hidden@/gr-audio-jack/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