diff options
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/src/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-comedi/src/run_tests.in | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 3311cd569..b14a7361d 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -36,7 +36,7 @@ LOCAL_IFILES = \ comedi.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -76,6 +76,7 @@ swiginclude_HEADERS = \ _comedi_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LIBS) \ + $(COMEDI_LIBS) \ -lstdc++ _comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-comedi/src/run_tests.in b/gr-comedi/src/run_tests.in index 6c0ba9d18..facf62add 100644 --- a/gr-comedi/src/run_tests.in +++ b/gr-comedi/src/run_tests.in @@ -20,7 +20,9 @@ py=@abs_top_srcdir@/gr-comedi/src # 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 |