diff options
| author | jcorgan | 2008-02-08 23:32:10 +0000 |
|---|---|---|
| committer | jcorgan | 2008-02-08 23:32:10 +0000 |
| commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
| tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /gr-atsc/src | |
| parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
| download | gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.gz gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.bz2 gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.zip | |
Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-atsc/src')
| -rw-r--r-- | gr-atsc/src/lib/Makefile.am | 7 | ||||
| -rw-r--r-- | gr-atsc/src/python/Makefile.am | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index a114e6d9b..96e55a636 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2001,2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,7 +28,8 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) EXTRA_DIST = \ atsci_viterbi_gen.cc \ @@ -214,7 +215,7 @@ test_atsci_LDADD = \ # ------------------------------------------------------------------------ SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \ - $(STD_DEFINES_AND_INCLUDES) + $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am index ffc7780df..80e4de183 100644 --- a/gr-atsc/src/python/Makefile.am +++ b/gr-atsc/src/python/Makefile.am @@ -28,7 +28,6 @@ EXAMPLE_FILES = \ interp.py \ xlate.py \ viterbi-out.py - EXTRA_DIST = run_tests.in \ $(EXAMPLE_FILES) @@ -46,7 +45,7 @@ noinst_PYTHON = \ qa_atsc.py # Make example scripts with #! executable -install-data-local: +install-data-local: install-ourdataDATA for i in `find $(ourdatadir) -type f ! -perm 755`; do \ if head -1 $$i | grep -q '^#!'; then \ chmod 755 $$i; \ |