[Commit-gnuradio] r3210 - in gnuradio/branches/developers/jcorgan/ticket-10: . gr-radar/src/lib gr-radar/src/python

[jcorgan]

Author: jcorgan
Date: 2006-08-07 08:09:35 -0600 (Mon, 07 Aug 2006)
New Revision: 3210

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

Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
14:03:32 UTC (rev 3209)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
14:09:35 UTC (rev 3210)
@@ -160,7 +160,7 @@
 GRC_GR_COMEDI
 GRC_GR_ERROR_CORRECTING_CODES
 GRC_GR_GSM_FR_VOCODER
-#GRC_GR_RADAR
+GRC_GR_RADAR
 #GRC_GR_RADIO_ASTRONOMY
 #GRC_GR_PMT
 #GRC_GR_VIDEO_SDL

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radar/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/gr-radar/src/lib/Makefile.am 
2006-08-07 14:03:32 UTC (rev 3209)
+++ gnuradio/branches/developers/jcorgan/ticket-10/gr-radar/src/lib/Makefile.am 
2006-08-07 14:09:35 UTC (rev 3210)
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-LIBS += $(GNURADIO_CORE_LIBS)
-
 # Install this stuff so that it ends up as the gnuradio.radar module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -39,7 +37,7 @@
        $(NON_LOCAL_IFILES)             
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdr)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 
 LOCAL_IFILES =                                 
@@ -66,16 +64,16 @@
        sim-airplane2                   
 
 xambi_SOURCES  = xambi.cc
-xambi_LDADD    = libradar.la
+xambi_LDADD    = libradar.la $(GNURADIO_CORE_LIBS)
 
 eb_xambi_SOURCES = eb-xambi.cc
-eb_xambi_LDADD  = libradar.la
+eb_xambi_LDADD  = libradar.la $(GNURADIO_CORE_LIBS)
 
 sim_airplane_SOURCES = sim-airplane.cc
-sim_airplane_LDADD = libradar.la
+sim_airplane_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
 
 sim_airplane2_SOURCES = sim-airplane2.cc
-sim_airplane2_LDADD = libradar.la
+sim_airplane2_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
 
 # This gets howto.py installed in the right place
 # ourpython_PYTHON =                   

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radar/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radar/src/python/run_tests.in 
    2006-08-07 14:03:32 UTC (rev 3209)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radar/src/python/run_tests.in 
    2006-08-07 14:09:35 UTC (rev 3210)
@@ -18,9 +18,9 @@
 address@hidden@/gr-radar/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