[Commit-gnuradio] r3202 - in gnuradio/branches/developers/jcorgan/ticket-10: . gr-audio-oss/src

[jcorgan]

Author: jcorgan
Date: 2006-08-06 23:38:09 -0600 (Sun, 06 Aug 2006)
New Revision: 3202

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/run_tests.in
Log:
gr-audio-oss now completes VPATH build.  Also partial fix for
ticket:18 and ticket:19.


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

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am 
2006-08-07 05:33:42 UTC (rev 3201)
+++ gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am 
2006-08-07 05:38:09 UTC (rev 3202)
@@ -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_oss module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -37,7 +35,7 @@
        audio_oss.i                             
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -71,6 +69,7 @@
 
 _audio_oss_la_LIBADD =                         \
        $(PYTHON_LDFLAGS)               \
+       $(GNURADIO_CORE_LIBS)           \
        $(OSS_LIBS)                     \
        -lstdc++                                
 

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