diff options
| -rw-r--r-- | Makefile.common | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/Makefile.am | 8 | ||||
| -rw-r--r-- | gnuradio-core/src/guile/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-guile/apps/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-guile/example-waveforms/Makefile.am | 3 |
5 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.common b/Makefile.common index c683a9f9b..182b29ffa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -148,7 +148,6 @@ gnuradio/%.scm : %.i $(SED) -e 's|python/\(.*\)\.cc:|\1.py:|' python/$*.Std > python/$*.d $(RM) python/$*.Std -# Don't distribute the files defined in the variable 'no_dist_files' # or the directories listed in no_dist_dirs (set in Makefile.swig) dist-hook: @for dir in $(no_dist_dirs); do \ diff --git a/gnuradio-core/src/Makefile.am b/gnuradio-core/src/Makefile.am index 648fe299e..1717d373a 100644 --- a/gnuradio-core/src/Makefile.am +++ b/gnuradio-core/src/Makefile.am @@ -21,12 +21,6 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = gen_interpolator_taps lib tests -if PYTHON -SUBDIRS += python -endif -if GUILE -SUBDIRS += guile -endif +SUBDIRS = gen_interpolator_taps lib tests python guile DIST_SUBDIRS = gen_interpolator_taps lib tests python guile utils diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 0c0becbc1..c2f8b5c39 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -23,6 +23,7 @@ TESTS = run_guile_tests EXTRA_DIST = \ run_guile_tests.in \ + $(nobase_guile_DATA) \ $(GUILE_TESTS) # These are the hand-code guile files for gnuradio-core. @@ -51,3 +52,5 @@ GUILE_TESTS = \ tests/io_ctors.test CLEANFILES = guile.log + +no_dist_dirs = python guile diff --git a/gr-guile/apps/Makefile.am b/gr-guile/apps/Makefile.am index 7e4c3c2c4..7ad5ef2cd 100644 --- a/gr-guile/apps/Makefile.am +++ b/gr-guile/apps/Makefile.am @@ -21,3 +21,5 @@ include $(top_srcdir)/Makefile.common bin_SCRIPTS = \ gr-run-waveform + +EXTRA_DIST = gr-run-waveform diff --git a/gr-guile/example-waveforms/Makefile.am b/gr-guile/example-waveforms/Makefile.am index cda4172de..b004e26a2 100644 --- a/gr-guile/example-waveforms/Makefile.am +++ b/gr-guile/example-waveforms/Makefile.am @@ -23,3 +23,6 @@ waveformdir=$(datarootdir)/gnuradio/example-waveforms waveform_DATA = \ dial-tone.wfd + +EXTRA_DIST = \ + dial-tone.wfd |