diff options
| author | jcorgan | 2006-08-07 15:41:19 +0000 |
|---|---|---|
| committer | jcorgan | 2006-08-07 15:41:19 +0000 |
| commit | e27ba9aebfddf88cd245636d2f652a4ee4e289ec (patch) | |
| tree | 01f44251578419823c34f140ee58d8fc6016a1c2 /gr-audio-windows | |
| parent | 37bee553f670da9c82b5a438fe06df3a1ca8b2aa (diff) | |
| download | gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.gz gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.bz2 gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.zip | |
Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10. 'make distcheck' now
successfully completes on a machine that has never had gnuradio installed
before. In addition, several cleanups and refactoring of build system
code have been applied. NOTE: gr-audio-portaudio, gr-audio-osx, and
gr-audio-windows have not been fully tested and will need verification
by the maintainers of these components.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3216 221aa14e-8319-0410-a670-987f0aec2ac5
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 |