diff options
| author | Eric Blossom | 2010-11-24 17:29:11 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-24 17:29:11 -0800 |
| commit | d692a41f98e7b888c745efbb9fcbbb0400f39025 (patch) | |
| tree | 591782e695d1d29f2dfcfe6390fc21cd99a06a16 /gr-trellis | |
| parent | 42fe3e571be14e70cb06ea1244125553f0606be4 (diff) | |
| download | gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.tar.gz gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.tar.bz2 gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.zip | |
Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*
Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 13 | ||||
| -rw-r--r-- | gr-trellis/src/python/Makefile.am | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am index 559d271dc..9e6b81ac0 100644 --- a/gr-trellis/doc/Makefile.am +++ b/gr-trellis/doc/Makefile.am @@ -30,7 +30,7 @@ endif all: $(HTML_FILES) -EXTRA_DIST = \ +EXTRA_DIST += \ gr-trellis.xml \ make_numbered_listing.py \ test_tcm.py \ diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 57982629b..b23b5b467 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST = \ +EXTRA_DIST += \ run_guile_tests.in \ trellis.test @@ -57,7 +57,7 @@ python_built_sources = \ $(GENERATED_CC) \ trellis_generated.i -EXTRA_DIST = \ +EXTRA_DIST += \ $(core_generator) # These headers get installed in ${prefix}/include/gnuradio @@ -137,14 +137,7 @@ gen_sources_deps = $(core_generator) par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py include $(top_srcdir)/Makefile.par.gen - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = \ - $(python_built_sources) \ - $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +BUILT_SOURCES += $(python_built_sources) if GUILE TESTS += run_guile_tests diff --git a/gr-trellis/src/python/Makefile.am b/gr-trellis/src/python/Makefile.am index 2b93300de..808ac4fb7 100644 --- a/gr-trellis/src/python/Makefile.am +++ b/gr-trellis/src/python/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = run_tests.in \ +EXTRA_DIST += run_tests.in \ awgn1o2_4.fsm |