[Commit-gnuradio] r3209 - in gnuradio/branches/developers/jcorgan/ticket-10: . gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/python

[jcorgan]

Author: jcorgan
Date: 2006-08-07 08:03:32 -0600 (Mon, 07 Aug 2006)
New Revision: 3209

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/lib/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/python/run_tests.in
Log:
gr-gsm-fr-vocoder passes VPATH build.

Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
13:57:46 UTC (rev 3208)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
14:03:32 UTC (rev 3209)
@@ -159,7 +159,7 @@
 GRC_GR_ATSC
 GRC_GR_COMEDI
 GRC_GR_ERROR_CORRECTING_CODES
-#GRC_GR_GSM_FR_VOCODER
+GRC_GR_GSM_FR_VOCODER
 #GRC_GR_RADAR
 #GRC_GR_RADIO_ASTRONOMY
 #GRC_GR_PMT

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/lib/Makefile.am
        2006-08-07 13:57:46 UTC (rev 3208)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/lib/Makefile.am
        2006-08-07 14:03:32 UTC (rev 3209)
@@ -23,8 +23,6 @@
 
 SUBDIRS = gsm .
 
-LIBS += $(GNURADIO_CORE_LIBS)
-
 # Install this stuff so that it ends up as the gnuradio.vocoder module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder
@@ -42,7 +40,7 @@
        $(NON_LOCAL_IFILES)             
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 
 LOCAL_IFILES =                                 \
@@ -78,6 +76,7 @@
 _gsm_full_rate_la_LIBADD =     \
        gsm/libgsm.la           \
        $(PYTHON_LDFLAGS)       \
+       $(GNURADIO_CORE_LIBS)   \
        -lstdc++                        
 
 gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/python/run_tests.in
    2006-08-07 13:57:46 UTC (rev 3208)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-gsm-fr-vocoder/src/python/run_tests.in
    2006-08-07 14:03:32 UTC (rev 3209)
@@ -18,9 +18,9 @@
 address@hidden@/gr-gsm-fr-vocoder/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