[Commit-gnuradio] r3199 - in gnuradio/branches/developers/jcorgan/ticket-10: . gr-atsc/src/lib gr-atsc/src/python gr-usrp/src

[jcorgan]

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

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/lib/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/python/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-10/gr-usrp/src/run_tests.in
Log:
gr-usrp and gr-atsc both now complete VPATH build and make check.


Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
04:02:41 UTC (rev 3198)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
05:13:38 UTC (rev 3199)
@@ -150,21 +150,21 @@
 GRC_GNURADIO_EXAMPLES
 GRC_USRP
 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_OSX               dnl ***NOT TESTED***
-GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
-GRC_GR_AUDIO_WINDOWS           dnl ***NOT TESTED***
+#GRC_GR_AUDIO_ALSA
+#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_WINDOWS          dnl ***NOT TESTED***
 GRC_GR_ATSC
-GRC_GR_COMEDI
-GRC_GR_ERROR_CORRECTING_CODES
-GRC_GR_GSM_FR_VOCODER
-GRC_GR_RADAR
-GRC_GR_RADIO_ASTRONOMY
-GRC_GR_PMT
-GRC_GR_VIDEO_SDL
-GRC_GR_WXGUI
+#GRC_GR_COMEDI
+#GRC_GR_ERROR_CORRECTING_CODES
+#GRC_GR_GSM_FR_VOCODER
+#GRC_GR_RADAR
+#GRC_GR_RADIO_ASTRONOMY
+#GRC_GR_PMT
+#GRC_GR_VIDEO_SDL
+#GRC_GR_WXGUI
 
 dnl Has list of successfully configured components
 AC_SUBST([subdirs],$subdirs)

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/lib/Makefile.am  
2006-08-07 04:02:41 UTC (rev 3198)
+++ gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/lib/Makefile.am  
2006-08-07 05:13:38 UTC (rev 3199)
@@ -218,7 +218,7 @@
        $(NON_LOCAL_IFILES)             
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 LOCAL_IFILES =                                 \
        atsc.i                          

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/python/run_tests.in  
    2006-08-07 04:02:41 UTC (rev 3198)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-atsc/src/python/run_tests.in  
    2006-08-07 05:13:38 UTC (rev 3199)
@@ -18,9 +18,9 @@
 address@hidden@/gr-atsc/src/python
 
 # 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

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/gr-usrp/src/run_tests.in     
2006-08-07 04:02:41 UTC (rev 3198)
+++ gnuradio/branches/developers/jcorgan/ticket-10/gr-usrp/src/run_tests.in     
2006-08-07 05:13:38 UTC (rev 3199)
@@ -18,10 +18,12 @@
 address@hidden@/gr-usrp/src
 
 # Where to look for GNU Radio python modules in current build tree
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
+grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 
 # Where to look for USRP lib in current build tree
address@hidden@/usrp/host/lib/.libs
address@hidden@/usrp/host/lib
 
 PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
 export PYTHONPATH