diff options
Diffstat (limited to 'gr-radar')
| -rw-r--r-- | gr-radar/src/lib/Makefile.am | 12 | ||||
| -rw-r--r-- | gr-radar/src/python/run_tests.in | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gr-radar/src/lib/Makefile.am b/gr-radar/src/lib/Makefile.am index 8ea52aab4..be4b50379 100644 --- a/gr-radar/src/lib/Makefile.am +++ b/gr-radar/src/lib/Makefile.am @@ -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 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdr)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = @@ -66,16 +64,16 @@ bin_PROGRAMS = \ 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 = diff --git a/gr-radar/src/python/run_tests.in b/gr-radar/src/python/run_tests.in index fd0a43ab2..d3519f4d1 100644 --- a/gr-radar/src/python/run_tests.in +++ b/gr-radar/src/python/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-radar/src/lib py=@abs_top_srcdir@/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. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/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 |