diff options
Diffstat (limited to 'gr-audio-windows')
| -rw-r--r-- | gr-audio-windows/src/Makefile.am | 7 | ||||
| -rwxr-xr-x | gr-audio-windows/src/run_tests.in | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 3d9446d3e..33129b7ac 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -35,7 +35,7 @@ LOCAL_IFILES = \ audio_windows.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -50,8 +50,7 @@ ourpython_PYTHON = \ INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) \ - -I$(swigincludedir) -I$(grincludedir) +SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) ourlib_LTLIBRARIES = _audio_windows.la @@ -71,7 +70,7 @@ swiginclude_HEADERS = \ _audio_windows_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LIBS) \ - -lwinmm \ + $(WINAUDIO_LIBS) \ -lstdc++ _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \ diff --git a/gr-audio-windows/src/run_tests.in b/gr-audio-windows/src/run_tests.in index 6eb596383..da4a03be5 100755 --- a/gr-audio-windows/src/run_tests.in +++ b/gr-audio-windows/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-windows/src py=@abs_top_srcdir@/gr-audio-windows/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 |