[Commit-gnuradio] r3207 - in gnuradio/branches/developers/jcorgan/ticket-10: . gr-error-correcting-codes/src/lib gr-error-correcting-codes/src/lib/libecc gr-error-correcting-codes/src/python

[jcorgan]

Author: jcorgan
Date: 2006-08-07 07:54:02 -0600 (Mon, 07 Aug 2006)
New Revision: 3207

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/libecc/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/run_tests.in
Log:
gr-error-correcting codes passes VPATH build with src/python
qa testing disabled.


Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
06:03:52 UTC (rev 3206)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
13:54:02 UTC (rev 3207)
@@ -158,7 +158,7 @@
 GRC_GR_AUDIO_WINDOWS           dnl ***NOT TESTED***
 GRC_GR_ATSC
 GRC_GR_COMEDI
-#GRC_GR_ERROR_CORRECTING_CODES
+GRC_GR_ERROR_CORRECTING_CODES
 #GRC_GR_GSM_FR_VOCODER
 #GRC_GR_RADAR
 #GRC_GR_RADIO_ASTRONOMY

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/Makefile.am
        2006-08-07 06:03:52 UTC (rev 3206)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/Makefile.am
        2006-08-07 13:54:02 UTC (rev 3207)
@@ -39,7 +39,7 @@
        $(NON_LOCAL_IFILES)
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 LOCAL_IFILES =                                                 \
        ecc_syms_to_metrics.i                           \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/libecc/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/libecc/Makefile.am
 2006-08-07 06:03:52 UTC (rev 3206)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/lib/libecc/Makefile.am
 2006-08-07 13:54:02 UTC (rev 3207)
@@ -23,7 +23,8 @@
 
 SUBDIRS = mld . tests
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) 
-I$(top_srcdir)/gr-error-correcting-codes/src/lib
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) \
+          -I$(top_srcdir)/gr-error-correcting-codes/src/lib
 
 noinst_LTLIBRARIES = libecc.la
 
@@ -49,6 +50,7 @@
 libecc_la_LIBADD =             \
        mld/libmld.la           \
        $(PYTHON_LDFLAGS)       \
+       $(GNURADIO_CORE_LIBS)   \
        -lstdc++
 
 MOSTLYCLEANFILES = *.loT *~

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/Makefile.am
     2006-08-07 06:03:52 UTC (rev 3206)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/Makefile.am
     2006-08-07 13:54:02 UTC (rev 3207)
@@ -24,7 +24,7 @@
 EXTRA_DIST = run_tests.in
 
 # Disable qa checks due to non-standard directory structure (eb)
-#TESTS = run_tests
+# TESTS = run_tests
 
 noinst_PYTHON =  qa_test_coding_1.py qa_test_coding_2.py
 

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/run_tests.in
    2006-08-07 06:03:52 UTC (rev 3206)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-error-correcting-codes/src/python/run_tests.in
    2006-08-07 13:54:02 UTC (rev 3207)
@@ -20,7 +20,9 @@
 # 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