diff options
Diffstat (limited to 'gr-audio-alsa/src')
| -rw-r--r-- | gr-audio-alsa/src/Makefile.am | 6 | ||||
| -rw-r--r-- | gr-audio-alsa/src/run_tests.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index e06fef9ae..b6a8ef388 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -28,8 +28,6 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -LIBS += $(GNURADIO_CORE_LIBS) - EXTRA_DIST = run_tests.in TESTS = run_tests @@ -38,7 +36,7 @@ LOCAL_IFILES = \ audio_alsa.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -76,6 +74,8 @@ swiginclude_HEADERS = \ _audio_alsa_la_LIBADD = \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ + $(ALSA_LIBS) \ -lstdc++ _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-audio-alsa/src/run_tests.in b/gr-audio-alsa/src/run_tests.in index 4bfb076e8..99d6ffd9b 100644 --- a/gr-audio-alsa/src/run_tests.in +++ b/gr-audio-alsa/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-alsa/src py=@abs_top_srcdir@/gr-audio-alsa/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 |