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-error-correcting-codes | |
| 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-error-correcting-codes')
4 files changed, 8 insertions, 4 deletions
diff --git a/gr-error-correcting-codes/src/lib/Makefile.am b/gr-error-correcting-codes/src/lib/Makefile.am index 602c560a0..75559527b 100644 --- a/gr-error-correcting-codes/src/lib/Makefile.am +++ b/gr-error-correcting-codes/src/lib/Makefile.am @@ -39,7 +39,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = \ ecc_syms_to_metrics.i \ diff --git a/gr-error-correcting-codes/src/lib/libecc/Makefile.am b/gr-error-correcting-codes/src/lib/libecc/Makefile.am index 95e760253..65a9ff414 100644 --- a/gr-error-correcting-codes/src/lib/libecc/Makefile.am +++ b/gr-error-correcting-codes/src/lib/libecc/Makefile.am @@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = mld . tests -INCLUDES = $(STD_DEFINES_AND_INCLUDES) -I$(top_srcdir)/gr-error-correcting-codes/src/lib +INCLUDES = $(STD_DEFINES_AND_INCLUDES) \ + -I$(top_srcdir)/gr-error-correcting-codes/src/lib noinst_LTLIBRARIES = libecc.la @@ -49,6 +50,7 @@ noinst_HEADERS = \ libecc_la_LIBADD = \ mld/libmld.la \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ -lstdc++ MOSTLYCLEANFILES = *.loT *~ diff --git a/gr-error-correcting-codes/src/python/Makefile.am b/gr-error-correcting-codes/src/python/Makefile.am index 2c435fe05..61d9fe0a4 100644 --- a/gr-error-correcting-codes/src/python/Makefile.am +++ b/gr-error-correcting-codes/src/python/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in # Disable qa checks due to non-standard directory structure (eb) -#TESTS = run_tests +# TESTS = run_tests noinst_PYTHON = qa_test_coding_1.py qa_test_coding_2.py diff --git a/gr-error-correcting-codes/src/python/run_tests.in b/gr-error-correcting-codes/src/python/run_tests.in index 4618f76c4..845ea3a19 100644 --- a/gr-error-correcting-codes/src/python/run_tests.in +++ b/gr-error-correcting-codes/src/python/run_tests.in @@ -20,7 +20,9 @@ py=@abs_top_srcdir@/gr-error-correcting-codes/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 |