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-gsm-fr-vocoder/src | |
| 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-gsm-fr-vocoder/src')
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/Makefile.am | 5 | ||||
| -rw-r--r-- | gr-gsm-fr-vocoder/src/python/run_tests.in | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 974604d92..06ab5caab 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -23,8 +23,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = gsm . -LIBS += $(GNURADIO_CORE_LIBS) - # Install this stuff so that it ends up as the gnuradio.vocoder module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder @@ -42,7 +40,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = \ @@ -78,6 +76,7 @@ _gsm_full_rate_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _gsm_full_rate_la_LIBADD = \ gsm/libgsm.la \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ -lstdc++ gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES) diff --git a/gr-gsm-fr-vocoder/src/python/run_tests.in b/gr-gsm-fr-vocoder/src/python/run_tests.in index 2c3be9078..a06faeb6d 100644 --- a/gr-gsm-fr-vocoder/src/python/run_tests.in +++ b/gr-gsm-fr-vocoder/src/python/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-gsm-fr-vocoder/src/lib py=@abs_top_srcdir@/gr-gsm-fr-vocoder/src/python # 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 |