diff options
Diffstat (limited to 'gr-audio-oss')
| -rw-r--r-- | gr-audio-oss/src/Makefile.am | 5 | ||||
| -rw-r--r-- | gr-audio-oss/src/run_tests.in | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index 1a73d8d4c..319db7a8c 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/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.audio_oss module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio @@ -37,7 +35,7 @@ LOCAL_IFILES = \ audio_oss.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -71,6 +69,7 @@ swiginclude_HEADERS = \ _audio_oss_la_LIBADD = \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ $(OSS_LIBS) \ -lstdc++ diff --git a/gr-audio-oss/src/run_tests.in b/gr-audio-oss/src/run_tests.in index ec252d508..402a8c444 100644 --- a/gr-audio-oss/src/run_tests.in +++ b/gr-audio-oss/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-oss/src py=@abs_top_srcdir@/gr-audio-oss/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 |