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 | |
| 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.
93 files changed, 245 insertions, 402 deletions
diff --git a/Makefile.am b/Makefile.am index 091646874..5891c2c89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I config include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ bootstrap \ configure \ configure-cell-cross \ diff --git a/Makefile.common b/Makefile.common index dd95141e1..fbdbf4e7e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -20,6 +20,16 @@ # Boston, MA 02110-1301, USA. # +# Every Makefile starts with common vars so we can +# consistently use += +BUILT_SOURCES = +MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT +CLEANFILES = guile.log +DISTCLEANFILES = +EXTRA_DIST = +STAMPS = + + # Make rebuilds less verbose with stuff we can safely ignore # about GNU make only extensions. AUTOMAKE += -Wno-portability -Wnone @@ -116,10 +126,6 @@ gr_prefsdir = $(GR_PREFSDIR) # Data directory for grc block wrappers grc_blocksdir = $(pkgdatadir)/grc/blocks -# Other common defines; use "+=" to add to these -STAMPS = -MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT - ## SWIG suffixes for automake to know about SUFFIXES = .i .scm .py @@ -148,7 +154,7 @@ gnuradio/%.scm : %.i $(SED) -e 's|python/\(.*\)\.cc:|\1.py:|' python/$*.Std > python/$*.d $(RM) python/$*.Std -# or the directories listed in no_dist_dirs (set in Makefile.swig) + dist-hook: @for file in $(no_dist_files); do \ echo $(RM) $(distdir)/$$file; \ diff --git a/Makefile.swig b/Makefile.swig index 7f70700b9..0980d5840 100644 --- a/Makefile.swig +++ b/Makefile.swig @@ -25,9 +25,6 @@ ## in Makefile.am's which require SWIG wrapping / compilation. ## For just installing .i files, this Makefile is not required. -CLEANFILES = python/*.cc python/*.h python/*.lo python/*.o python/*.d -CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.lo guile/*.o guile/*.d - ## swig flags ## -w511 turns off keyword argument warning ## "-outdir $(builddir)" writes all generated output files to @@ -135,15 +132,22 @@ include $(srcdir)/Makefile.swig.gen if PYTHON # Create a list of .py files based on the top level .i files. -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) +PYTHON_GEN = $(foreach IFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(IFILE))) swig_built_sources += $(PYTHON_GEN) endif if GUILE # Create a list of .scm files based on the top level .i files. -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) +GUILE_GEN = $(foreach IFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(IFILE))) swig_built_sources += $(GUILE_GEN) endif -no_dist_dirs = python gnuradio guile +BUILT_SOURCES += $(swig_built_sources) + +# FIXME swig_all_built_sources no_dist_files = $(swig_built_sources) + +# FIXME swig_all_built_sources +CLEANFILES += python/*.cc python/*.h python/*.lo python/*.o python/*.d +CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.lo guile/*.o guile/*.d + diff --git a/config/Makefile.am b/config/Makefile.am index f5f478cff..6e8f81987 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -109,4 +109,4 @@ m4macros = \ usrp_libusb.m4 \ usrp_sdcc.m4 -EXTRA_DIST = $(m4macros) +EXTRA_DIST += $(m4macros) diff --git a/docs/doxygen/other/Makefile.am b/docs/doxygen/other/Makefile.am index eb5f170af..82ee0f945 100644 --- a/docs/doxygen/other/Makefile.am +++ b/docs/doxygen/other/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ doxypy.py \ group_defs.dox \ shared_ptr_docstub.h \ diff --git a/gcell/ibm/Makefile.am b/gcell/ibm/Makefile.am index 8013e6a3a..6438c7331 100644 --- a/gcell/ibm/Makefile.am +++ b/gcell/ibm/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ ./README \ ./sync/ppu_source/atomic_add.h \ ./sync/ppu_source/atomic_add_return.h \ diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am index 107ff785b..0a4e7e151 100644 --- a/gnuradio-core/Makefile.am +++ b/gnuradio-core/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ gnuradio-core.pc.in SUBDIRS = src diff --git a/gnuradio-core/src/gen_interpolator_taps/Makefile.am b/gnuradio-core/src/gen_interpolator_taps/Makefile.am index d244e7f54..1b54af5e7 100644 --- a/gnuradio-core/src/gen_interpolator_taps/Makefile.am +++ b/gnuradio-core/src/gen_interpolator_taps/Makefile.am @@ -21,7 +21,13 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = praxis.txt simpson.h objective_fct.c gen_interpolator_taps.c simpson.c praxis.f +EXTRA_DIST += \ + praxis.txt \ + simpson.h \ + objective_fct.c \ + gen_interpolator_taps.c \ + simpson.c \ + praxis.f # if ENABLE_FORTRAN # noinst_PROGRAMS = gen_interpolator_taps diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index c2f8b5c39..209e664a0 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common TESTS = run_guile_tests -EXTRA_DIST = \ +EXTRA_DIST += \ run_guile_tests.in \ $(nobase_guile_DATA) \ $(GUILE_TESTS) @@ -52,5 +52,3 @@ GUILE_TESTS = \ tests/io_ctors.test CLEANFILES = guile.log - -no_dist_dirs = python guile diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 6d2ec1c7e..38edee3d5 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -67,7 +67,7 @@ code_generator = \ # Source built by Python into $(builddir) -BUILT_SOURCES = \ +BUILT_SOURCES += \ $(GENERATED_H) \ $(GENERATED_I) \ $(GENERATED_CC) \ @@ -178,7 +178,7 @@ EXTRA_libfilter_la_SOURCES = \ $(armv7_a_qa_CODE) -EXTRA_DIST = \ +EXTRA_DIST += \ 3dnow_float_dotprod_really_simple.S \ 3dnow_float_dotprod_simple.S \ $(code_generator) diff --git a/gnuradio-core/src/lib/g72x/Makefile.am b/gnuradio-core/src/lib/g72x/Makefile.am index 6c41f1911..d2700376f 100644 --- a/gnuradio-core/src/lib/g72x/Makefile.am +++ b/gnuradio-core/src/lib/g72x/Makefile.am @@ -24,4 +24,4 @@ include $(top_srcdir)/Makefile.common noinst_LTLIBRARIES = libccitt.la libccitt_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h -EXTRA_DIST = encode.c decode.c +EXTRA_DIST += encode.c decode.c diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 735795789..b25326deb 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -29,7 +29,7 @@ BUILT_SOURCES = # ---------------------------------------------------------------- -EXTRA_DIST = \ +EXTRA_DIST += \ gen_sine_table.py \ gr_constants.cc.in diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index 4978ad1c5..cfa043b67 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -115,7 +115,7 @@ core_generator = \ gr_moving_average_XX.i.t # Source built by Python into $(builddir) -BUILT_SOURCES = \ +BUILT_SOURCES += \ $(GENERATED_H) \ $(GENERATED_I) \ $(GENERATED_CC) \ @@ -123,7 +123,7 @@ BUILT_SOURCES = \ # ---------------------------------------------------------------- -EXTRA_DIST = \ +EXTRA_DIST += \ $(core_generator) libgengen_la_SOURCES = \ diff --git a/gnuradio-core/src/lib/missing/Makefile.am b/gnuradio-core/src/lib/missing/Makefile.am index 238370910..bd18cf143 100644 --- a/gnuradio-core/src/lib/missing/Makefile.am +++ b/gnuradio-core/src/lib/missing/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(GNURADIO_INCLUDES) $(WITH_INCLUDES) -EXTRA_DIST = \ +EXTRA_DIST += \ getopt.h \ getopt.c \ gettimeofday.c \ diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.am b/gnuradio-core/src/lib/reed-solomon/Makefile.am index b7bd939b0..5548f4280 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.am +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.am @@ -29,7 +29,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) TESTS = rstest -EXTRA_DIST = \ +EXTRA_DIST += \ README.karn noinst_LTLIBRARIES = librs.la diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index a97bb6ea0..f8e7640ae 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -22,7 +22,8 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) +AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(WITH_INCLUDES) # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_core into 6 @@ -52,11 +53,6 @@ nobase_swiginclude_HEADERS = \ guile/std_vector.i -AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -EXTRA_DIST = gen-swig-bug-fix - # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr @@ -67,9 +63,12 @@ ourpython_PYTHON = gnuradio_core.py # gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix # $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ +EXTRA_DIST += gen-swig-bug-fix + # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h + # Install so that they end up available as: # import gnuradio.gr # This ends up at: @@ -89,5 +88,4 @@ gnuradio_core_filter_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_io_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) - SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE diff --git a/gnuradio-core/src/python/bin/Makefile.am b/gnuradio-core/src/python/bin/Makefile.am index 0afd32767..6f9f162f1 100644 --- a/gnuradio-core/src/python/bin/Makefile.am +++ b/gnuradio-core/src/python/bin/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005,2009 Free Software Foundation, Inc. +# Copyright 2005,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = microtune.py +EXTRA_DIST += microtune.py noinst_SCRIPTS = \ microtune.py diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am index 7d89777ef..b8da9cf48 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ run_tests.in \ test_16bit_1chunk.wav diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am index 2bf7cb4e5..c75bb8c2a 100644 --- a/gnuradio-core/src/tests/Makefile.am +++ b/gnuradio-core/src/tests/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2008 Free Software Foundation, Inc. +# Copyright 2001,2008,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -31,7 +31,7 @@ TESTS = test_all # test_atsc #Test program to test setting up buffers using gr_test which can be run manually -EXTRA_DIST = \ +EXTRA_DIST += \ test_buffers.py \ benchmark_dotprod diff --git a/gnuradio-core/src/utils/Makefile.am b/gnuradio-core/src/utils/Makefile.am index 22dae7117..acf439140 100644 --- a/gnuradio-core/src/utils/Makefile.am +++ b/gnuradio-core/src/utils/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ cic_comp_taps.m \ db_width.m \ filter_tools.m \ diff --git a/gnuradio-examples/python/apps/Makefile.am b/gnuradio-examples/python/apps/Makefile.am index 620b9fd29..50fe75151 100644 --- a/gnuradio-examples/python/apps/Makefile.am +++ b/gnuradio-examples/python/apps/Makefile.am @@ -19,6 +19,8 @@ # Boston, MA 02110-1301, USA. # +include $(top_srcdir)/Makefile.common + SUBDIRS = hf_explorer hf_radio -EXTRA_DIST = README +EXTRA_DIST += README diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 1ca31d14b..b1bda90ff 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2004,2005,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2001,2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,11 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) -EXTRA_DIST = \ +EXTRA_DIST += \ atsci_viterbi_gen.cc \ gen_encoder.py \ qa_atsci_trellis_encoder_t1_input.dat \ @@ -87,7 +88,7 @@ libgnuradio_atsc_la_SOURCES = \ plinfo.cc -BUILT_SOURCES = \ +BUILT_SOURCES += \ atsci_viterbi_mux.cc libgnuradio_atsc_la_LIBADD = \ @@ -211,12 +212,11 @@ test_atsci_LDADD = \ # Cleanup # ------------------------------------------------------------------------ -CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT) +CLEANFILES += atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT) -if PYTHON # ------------------------------------------------------------------------ # This is the swig-ish part of the Makefile. -# It builds the atsc module which we'll load into python +# It builds the atsc modules which we'll load into python or guile # ------------------------------------------------------------------------ TOP_SWIG_IFILES = \ @@ -233,11 +233,4 @@ atsc_pythondir_category = \ atsc_la_swig_libadd = \ libgnuradio-atsc.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES += $(swig_built_sources) -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am index 98aead0fa..7b2f5c871 100644 --- a/gr-atsc/src/python/Makefile.am +++ b/gr-atsc/src/python/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ run_tests.in ourdatadir = $(exampledir)/atsc diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index 11419d693..330158aa5 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -20,12 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = - -EXTRA_DIST = run_tests.in run_guile_tests.in - -DISTCLEANFILES = run_tests run_guile_tests +EXTRA_DIST += run_tests.in run_guile_tests.in +DISTCLEANFILES += run_tests run_guile_tests # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -87,11 +86,3 @@ TESTS += run_guile_tests endif -# Uses the variables above to define how to generate SWIG bindings -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index f7f65a744..9a0c8b9be 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005,2008,2009 Free Software Foundation, Inc. +# Copyright 2005,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,9 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST = run_tests.in +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -50,11 +52,8 @@ noinst_PYTHON = \ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -if PYTHON ################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ audio_jack.i @@ -70,11 +69,7 @@ audio_jack_pythondir_category = \ audio_jack_la_swig_libadd = \ libgnuradio-audio-jack.la -include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index acb29b9fd..2468958b2 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,12 +20,14 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -EXTRA_DIST = run_tests.in # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -46,12 +48,8 @@ libgnuradio_audio_oss_la_LIBADD = \ libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests - +# SWIG interface and library TOP_SWIG_IFILES = \ audio_oss.i @@ -66,11 +64,7 @@ audio_oss_pythondir_category = \ audio_oss_la_swig_libadd = \ libgnuradio-audio-oss.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif diff --git a/gr-audio-osx/Makefile.am b/gr-audio-osx/Makefile.am index df9c680b5..84a4c69b3 100644 --- a/gr-audio-osx/Makefile.am +++ b/gr-audio-osx/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,5 +21,5 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = README_OSX +EXTRA_DIST += README_OSX SUBDIRS = src diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index 253a041d4..fce31c9d2 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -20,9 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST = run_tests.in +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -55,11 +57,8 @@ libgnuradio_audio_osx_la_LDFLAGS = \ $(NO_UNDEFINED) \ $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ audio_osx.i @@ -75,11 +74,7 @@ audio_osx_pythondir_category = \ audio_osx_la_swig_libadd = \ libgnuradio-audio-osx.la -include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif +if PYTHON +TESTS += run_tests +endif
\ No newline at end of file diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index 2bf401060..f8d42792b 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,9 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST = run_tests.in +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES) @@ -52,11 +54,8 @@ libgnuradio_audio_portaudio_la_LIBADD = \ libgnuradio_audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ audio_portaudio.i @@ -72,11 +71,7 @@ audio_portaudio_pythondir_category = \ audio_portaudio_la_swig_libadd = \ libgnuradio-audio-portaudio.la -include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif +if PYTHON +TESTS += run_tests +endif
\ No newline at end of file diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 97dc49f5a..1d7b253ec 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -20,10 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = - -EXTRA_DIST = run_tests.in +DISTCLEANFILES += run_tests +EXTRA_DIST += run_tests.in AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -49,11 +50,8 @@ libgnuradio_audio_windows_la_LDFLAGS = \ $(NO_UNDEFINED) \ $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests +# SWIG interface and library TOP_SWIG_IFILES = \ audio_windows.i @@ -69,11 +67,6 @@ audio_windows_pythondir_category = \ audio_windows_la_swig_libadd = \ libgnuradio-audio-windows.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index dd759d8a0..47f689adb 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005,2008,2009 Free Software Foundation, Inc. +# Copyright 2005,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,9 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST = run_tests.in +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests + AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -50,11 +53,8 @@ libgnuradio_comedi_la_LIBADD = \ libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ comedi.i @@ -70,11 +70,6 @@ comedi_pythondir_category = \ comedi_la_swig_libadd = \ libgnuradio-comedi.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index c5957f4ac..9c8c96b96 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.am +++ b/gr-cvsd-vocoder/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,7 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -39,9 +40,8 @@ libgnuradio_cvsd_vocoder_la_LIBADD = \ libgnuradio_cvsd_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library +# SWIG interface and library TOP_SWIG_IFILES = \ cvsd_vocoder.i @@ -56,12 +56,3 @@ cvsd_vocoder_pythondir_category = \ # additional libraries for linking with the SWIG-generated library cvsd_vocoder_la_swig_libadd = \ libgnuradio-cvsd-vocoder.la - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif diff --git a/gr-cvsd-vocoder/src/python/Makefile.am b/gr-cvsd-vocoder/src/python/Makefile.am index 2ba3abef8..e6fd74828 100644 --- a/gr-cvsd-vocoder/src/python/Makefile.am +++ b/gr-cvsd-vocoder/src/python/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2009 Free Software Foundation, Inc. +# Copyright 2004,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,9 +21,8 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = run_tests.in - - +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests TESTS = run_tests diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am index 3c3ee6973..dfbd8f828 100644 --- a/gr-gcell/src/Makefile.am +++ b/gr-gcell/src/Makefile.am @@ -19,8 +19,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests SUBDIRS = . examples @@ -32,9 +35,6 @@ AM_CPPFLAGS = $(GCELL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) \ noinst_PYTHON = \ qa_fft.py -DISTCLEANFILES = \ - gcell.d \ - run_tests # ---------------------------------------------------------------- # The C++ blocks @@ -56,12 +56,9 @@ libgnuradio_gcell_la_LIBADD = \ libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON # ---------------------------------------------------------------- # SWIG stuff # ---------------------------------------------------------------- -EXTRA_DIST = run_tests.in -TESTS += run_tests TOP_SWIG_IFILES = \ gcell.i @@ -86,11 +83,7 @@ gcell_swiginclude_headers = \ gc_job_manager.i \ gcell_fft_vcc.i -include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif diff --git a/gr-gpio/src/fpga/include/Makefile.am b/gr-gpio/src/fpga/include/Makefile.am index e4baf3506..3c891e5d6 100644 --- a/gr-gpio/src/fpga/include/Makefile.am +++ b/gr-gpio/src/fpga/include/Makefile.am @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -EXTRA_DIST = \ +include $(top_srcdir)/Makefile.common + +EXTRA_DIST += \ common_config_2rxhb_2tx_dig.vh \ common_config_2rxint_2tx_dig.vh \ common_config_bottom.vh diff --git a/gr-gpio/src/fpga/lib/Makefile.am b/gr-gpio/src/fpga/lib/Makefile.am index 2bed79c29..85fec113f 100644 --- a/gr-gpio/src/fpga/lib/Makefile.am +++ b/gr-gpio/src/fpga/lib/Makefile.am @@ -19,9 +19,11 @@ # Boston, MA 02110-1301, USA. # +include $(top_srcdir)/Makefile.common + SUBDIRS = -EXTRA_DIST = \ +EXTRA_DIST += \ gpio_input.v \ io_pins.v \ rx_chain_dig.v \ diff --git a/gr-gpio/src/fpga/top/Makefile.am b/gr-gpio/src/fpga/top/Makefile.am index c4b4e1fd7..34b00076c 100644 --- a/gr-gpio/src/fpga/top/Makefile.am +++ b/gr-gpio/src/fpga/top/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ config.vh \ usrp_gpio.csf \ usrp_gpio.esf \ diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 97d6fc306..4ce65bc31 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,7 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig SUBDIRS = gsm . @@ -42,7 +43,7 @@ libgnuradio_gsm_fr_vocoder_la_LIBADD = \ libgnuradio_gsm_fr_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON + # SWIG interface and library TOP_SWIG_IFILES = \ gsm_full_rate.i @@ -58,11 +59,3 @@ gsm_full_rate_pythondir_category = \ gsm_full_rate_la_swig_libadd = \ libgnuradio-gsm-fr-vocoder.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif diff --git a/gr-gsm-fr-vocoder/src/python/Makefile.am b/gr-gsm-fr-vocoder/src/python/Makefile.am index c6c326b44..8a97395ee 100644 --- a/gr-gsm-fr-vocoder/src/python/Makefile.am +++ b/gr-gsm-fr-vocoder/src/python/Makefile.am @@ -21,12 +21,10 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = run_tests.in - +EXTRA_DIST += run_tests.in TESTS = run_tests - noinst_PYTHON = \ encdec.py \ qa_gsm_full_rate.py diff --git a/gr-guile/apps/Makefile.am b/gr-guile/apps/Makefile.am index 7ad5ef2cd..04e1208bc 100644 --- a/gr-guile/apps/Makefile.am +++ b/gr-guile/apps/Makefile.am @@ -22,4 +22,4 @@ include $(top_srcdir)/Makefile.common bin_SCRIPTS = \ gr-run-waveform -EXTRA_DIST = 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 b004e26a2..277b4ad0b 100644 --- a/gr-guile/example-waveforms/Makefile.am +++ b/gr-guile/example-waveforms/Makefile.am @@ -24,5 +24,5 @@ waveformdir=$(datarootdir)/gnuradio/example-waveforms waveform_DATA = \ dial-tone.wfd -EXTRA_DIST = \ +EXTRA_DIST += \ dial-tone.wfd diff --git a/gr-howto-write-a-block/Makefile.am b/gr-howto-write-a-block/Makefile.am index 98368c211..bf3c4294d 100644 --- a/gr-howto-write-a-block/Makefile.am +++ b/gr-howto-write-a-block/Makefile.am @@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I config include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ bootstrap \ configure \ config.h.in \ diff --git a/gr-howto-write-a-block/config/Makefile.am b/gr-howto-write-a-block/config/Makefile.am index 23f4a4b16..e0cbadb8b 100644 --- a/gr-howto-write-a-block/config/Makefile.am +++ b/gr-howto-write-a-block/config/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001 Free Software Foundation, Inc. +# Copyright 2001,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -80,4 +80,4 @@ m4macros = \ # Don't install m4 macros anymore # m4data_DATA = $(m4macros) -EXTRA_DIST = $(m4macros) +EXTRA_DIST += $(m4macros) diff --git a/gr-howto-write-a-block/python/Makefile.am b/gr-howto-write-a-block/python/Makefile.am index ae36ea665..5c4fbd3a8 100644 --- a/gr-howto-write-a-block/python/Makefile.am +++ b/gr-howto-write-a-block/python/Makefile.am @@ -21,8 +21,8 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = run_tests.in TESTS = run_tests +EXTRA_DIST += run_tests.in modpython_PYTHON = \ __init__.py diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am index 17c4334f6..c6b1786f6 100644 --- a/gr-howto-write-a-block/swig/Makefile.am +++ b/gr-howto-write-a-block/swig/Makefile.am @@ -22,21 +22,10 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -CLEANFILES = python/*.cc python/*.h python/*.d -if GUILE -CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.d -endif - AM_CPPFLAGS += -I$(top_srcdir)/lib -swig_built_sources = - -if PYTHON ################################### -# SWIG Python interface and library +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ howto.i @@ -49,21 +38,8 @@ howto_la_swig_libadd = \ $(top_builddir)/lib/libgnuradio-howto.la # additional SWIG files to be installed -aqhowto_swiginclude_headers = \ +howto_swiginclude_headers = \ howto_square_ff.i \ howto_square2_ff.i -EXTRA_DIST = $(aqhowto_swiginclude_headers) - -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) -swig_built_sources += $(PYTHON_GEN) -endif - -if GUILE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) -swig_built_sources += $(GUILE_GEN) -endif - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - +EXTRA_DIST += $(howto_swiginclude_headers) diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am index 3549747b4..91173702f 100644 --- a/gr-msdd6000/src/Makefile.am +++ b/gr-msdd6000/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2008,2009 Free Software Foundation, Inc. +# Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,8 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) @@ -53,9 +55,8 @@ libgnuradio_msdd6000_rs_la_LIBADD = \ $(GNURADIO_CORE_LA) -if PYTHON ################################# -# SWIG interface and library +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ msdd.i msdd_rs.i @@ -76,12 +77,3 @@ msdd_la_swig_libadd = \ msdd_rs_la_swig_libadd = \ libgnuradio-msdd6000_rs.la - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am index 8fb6fbef8..b760e52b4 100644 --- a/gr-noaa/apps/Makefile.am +++ b/gr-noaa/apps/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -32,7 +32,7 @@ dist_bin_SCRIPTS = \ usrp_rx_hrpt_nogui.py \ usrp_rx_lrit.py -EXTRA_DIST = \ +EXTRA_DIST += \ hrpt_decode.grc \ hrpt_demod.grc \ file_rx_hrpt.grc \ diff --git a/gr-noaa/oct/Makefile.am b/gr-noaa/oct/Makefile.am index 2f6e4e575..68a0d1aed 100644 --- a/gr-noaa/oct/Makefile.am +++ b/gr-noaa/oct/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,6 +21,6 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ frames_to_ppm.m \ frames-to-png.sh diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am index 51a72ffb6..5bd3e431c 100644 --- a/gr-noaa/swig/Makefile.am +++ b/gr-noaa/swig/Makefile.am @@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += $(nobase_guile_DATA) if GUILE nobase_guile_DATA = gnuradio/noaa.scm @@ -63,12 +64,6 @@ noaa_swig_swiginclude_headers = \ noaa_hrpt_deframer.i \ noaa_hrpt_pll_cf.i -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - if GUILE TESTS += run_guile_tests endif diff --git a/gr-pager/apps/Makefile.am b/gr-pager/apps/Makefile.am index 7b495fd2b..a320ffefc 100644 --- a/gr-pager/apps/Makefile.am +++ b/gr-pager/apps/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -32,5 +32,5 @@ noinst_PYTHON = \ usrp_rx_flex.py endif -EXTRA_DIST = \ +EXTRA_DIST += \ usrp_rx_flex.grc diff --git a/gr-pager/python/Makefile.am b/gr-pager/python/Makefile.am index f80375c7c..4502859c3 100644 --- a/gr-pager/python/Makefile.am +++ b/gr-pager/python/Makefile.am @@ -21,7 +21,12 @@ include $(top_srcdir)/Makefile.common +TESTS = +EXTRA_DIST += run_tests.in + if PYTHON +TESTS += run_tests + pagerdir = $(grpythondir)/pager noinst_PYTHON = \ @@ -31,9 +36,4 @@ pager_PYTHON = \ __init__.py \ pager_utils.py \ flex_demod.py - -TESTS = run_tests - -EXTRA_DIST = run_tests.in - endif diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am index fe22753e3..901f24ede 100644 --- a/gr-pager/swig/Makefile.am +++ b/gr-pager/swig/Makefile.am @@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += $(nobase_guile_DATA) AM_CPPFLAGS = \ -I$(top_srcdir)/gr-pager/lib \ @@ -57,13 +58,6 @@ pager_swig_swiginclude_headers = \ pager_flex_sync.i \ pager_slicer_fb.i - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - if GUILE TESTS += run_guile_tests endif
\ No newline at end of file diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 1ee3c8e3d..b45b25c9d 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -20,6 +20,9 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +EXTRA_DIST += spectrumdisplayform.ui AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(QT_INCLUDES) $(WITH_INCLUDES) @@ -34,9 +37,7 @@ QMAKE_SOURCES = \ ConstellationDisplayPlot.moc.cc \ spectrumdisplayform.ui.h -EXTRA_DIST = spectrumdisplayform.ui - -BUILT_SOURCES = $(QMAKE_SOURCES) +BUILT_SOURCES += $(QMAKE_SOURCES) # Build the normal library for C++ apps to link against lib_LTLIBRARIES = libgnuradio-qtgui.la @@ -55,7 +56,7 @@ libgnuradio_qtgui_la_SOURCES = \ qtgui_sink_c.cc \ qtgui_sink_f.cc -nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES) +nodist_libgnuradio_qtgui_la_SOURCES=$(QMAKE_SOURCES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -88,9 +89,9 @@ libgnuradio_qtgui_la_LIBADD = \ -lstdc++ \ $(QT_LIBS) -if PYTHON + ############################## -# SWIG interface and library +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ qtgui.i @@ -105,14 +106,3 @@ qtgui_pythondir_category = \ # additional libraries for linking with the SWIG-generated library qtgui_la_swig_libadd = \ libgnuradio-qtgui.la - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES += \ - $(swig_built_sources) -endif - -# Do not distribute built sources, they may contain generated paths -# which are invalid on other systems -no_dist_files = $(BUILT_SOURCES) diff --git a/gr-qtgui/src/python/Makefile.am b/gr-qtgui/src/python/Makefile.am index 5544748df..31df63a44 100644 --- a/gr-qtgui/src/python/Makefile.am +++ b/gr-qtgui/src/python/Makefile.am @@ -29,7 +29,7 @@ noinst_PYTHON = \ usrp2_display.py \ usrp_display.py -EXTRA_DIST = \ +EXTRA_DIST += \ qt_digital_window.ui qtguipythondir = $(grpythondir)/qtgui diff --git a/gr-radar-mono/Makefile.am b/gr-radar-mono/Makefile.am index 8165eb435..98e3daf02 100644 --- a/gr-radar-mono/Makefile.am +++ b/gr-radar-mono/Makefile.am @@ -21,5 +21,5 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = README +EXTRA_DIST += README SUBDIRS = src doc diff --git a/gr-radar-mono/doc/Makefile.am b/gr-radar-mono/doc/Makefile.am index f6756d290..77d603f55 100644 --- a/gr-radar-mono/doc/Makefile.am +++ b/gr-radar-mono/doc/Makefile.am @@ -21,4 +21,4 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = registers.ods
\ No newline at end of file +EXTRA_DIST += registers.ods diff --git a/gr-radar-mono/src/fpga/lib/Makefile.am b/gr-radar-mono/src/fpga/lib/Makefile.am index a48e4f87f..e97ff1b6a 100644 --- a/gr-radar-mono/src/fpga/lib/Makefile.am +++ b/gr-radar-mono/src/fpga/lib/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ radar.v \ radar_config.vh \ radar_control.v \ diff --git a/gr-radar-mono/src/fpga/models/Makefile.am b/gr-radar-mono/src/fpga/models/Makefile.am index ca59fe78f..8a1a09597 100644 --- a/gr-radar-mono/src/fpga/models/Makefile.am +++ b/gr-radar-mono/src/fpga/models/Makefile.am @@ -21,5 +21,5 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ fifo_1clk.v diff --git a/gr-radar-mono/src/fpga/tb/Makefile.am b/gr-radar-mono/src/fpga/tb/Makefile.am index 1bff8795f..da45f497a 100644 --- a/gr-radar-mono/src/fpga/tb/Makefile.am +++ b/gr-radar-mono/src/fpga/tb/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ radar_tb.v \ radar_tb.sav \ radar_tb.sh \ diff --git a/gr-radar-mono/src/fpga/top/Makefile.am b/gr-radar-mono/src/fpga/top/Makefile.am index f51f3def3..51f73ebfe 100644 --- a/gr-radar-mono/src/fpga/top/Makefile.am +++ b/gr-radar-mono/src/fpga/top/Makefile.am @@ -29,7 +29,7 @@ dist_rbf2data_DATA = $(RBFS) rbf4datadir = $(prefix)/share/usrp/rev4 dist_rbf4data_DATA = $(RBFS) -EXTRA_DIST = \ +EXTRA_DIST += \ usrp_radar_mono.csf \ usrp_radar_mono.esf \ usrp_radar_mono.psf \ diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index d2dafdeac..1b6b854ea 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,10 +20,10 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -if PYTHON TOP_SWIG_IFILES = \ ra.i @@ -33,12 +33,3 @@ TOP_SWIG_IFILES = \ # ${prefix}/lib/python${python_version}/site-packages/gnuradio ra_pythondir_category = \ gnuradio - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif diff --git a/gr-radio-astronomy/src/python/Makefile.am b/gr-radio-astronomy/src/python/Makefile.am index e342651ae..2518e0647 100644 --- a/gr-radio-astronomy/src/python/Makefile.am +++ b/gr-radio-astronomy/src/python/Makefile.am @@ -32,7 +32,7 @@ ourlibdir = $(grpyexecdir) wxguipythondir = $(grpythondir)/wxgui wxguilibdir = $(grpyexecdir)/wxgui -EXTRA_DIST = \ +EXTRA_DIST += \ run_tests.in TESTS = run_tests diff --git a/gr-sounder/src/fpga/lib/Makefile.am b/gr-sounder/src/fpga/lib/Makefile.am index 3aae96371..a9586ebcc 100644 --- a/gr-sounder/src/fpga/lib/Makefile.am +++ b/gr-sounder/src/fpga/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2009 Free Software Foundation, Inc. +# Copyright 2007,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ dac_interface.v \ dacpll.v \ sounder.v \ diff --git a/gr-sounder/src/fpga/tb/Makefile.am b/gr-sounder/src/fpga/tb/Makefile.am index ec15f28d6..b21cb5f96 100644 --- a/gr-sounder/src/fpga/tb/Makefile.am +++ b/gr-sounder/src/fpga/tb/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2009 Free Software Foundation, Inc. +# Copyright 2007,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ sounder_tb.v \ sounder_tb.sav \ sounder_tb.sh \ diff --git a/gr-sounder/src/fpga/top/Makefile.am b/gr-sounder/src/fpga/top/Makefile.am index 63e07dc5b..f559991de 100644 --- a/gr-sounder/src/fpga/top/Makefile.am +++ b/gr-sounder/src/fpga/top/Makefile.am @@ -29,7 +29,7 @@ dist_rbf2data_DATA = $(RBFS) rbf4datadir = $(prefix)/share/usrp/rev4 dist_rbf4data_DATA = $(RBFS) -EXTRA_DIST = \ +EXTRA_DIST += \ config.vh \ usrp_sounder.v \ usrp_sounder.csf \ diff --git a/gr-sounder/src/python/Makefile.am b/gr-sounder/src/python/Makefile.am index 450c034bc..1d9b25254 100644 --- a/gr-sounder/src/python/Makefile.am +++ b/gr-sounder/src/python/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/Makefile.common sounder_pythondir = $(grpythondir) -EXTRA_DIST = \ +EXTRA_DIST += \ sounder_loopback.sh \ qa_nothing.py \ run_tests.in 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 diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index d424ca709..6a336c893 100644 --- a/gr-uhd/grc/Makefile.am +++ b/gr-uhd/grc/Makefile.am @@ -31,7 +31,7 @@ generated_uhd_single_usrp_blocks = \ uhd_single_usrp_source.xml \ uhd_single_usrp_sink.xml -BUILT_SOURCES = \ +BUILT_SOURCES += \ $(generated_uhd_multi_usrp_blocks) \ $(generated_uhd_single_usrp_blocks) @@ -49,7 +49,7 @@ dist_grcblocks_DATA += \ ######################################################################## # Rules for generating the source and sink xml wrappers ######################################################################## -EXTRA_DIST = \ +EXTRA_DIST += \ $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \ $(srcdir)/gen_uhd_single_usrp_blocks_xml.py diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am index abf38b293..11c0cabb2 100644 --- a/gr-uhd/swig/Makefile.am +++ b/gr-uhd/swig/Makefile.am @@ -22,6 +22,8 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig +EXTRA_DIST += $(nobase_guile_DATA) + AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ @@ -59,13 +61,6 @@ uhd_swig_python = \ # additional SWIG files to be installed uhd_swig_swiginclude_headers = - uhd_swig_swig_args = \ $(UHD_CFLAGS) \ -I$(top_srcdir)/gr-uhd/lib - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) diff --git a/gr-usrp/Makefile.am b/gr-usrp/Makefile.am index 136ce1579..221a10816 100644 --- a/gr-usrp/Makefile.am +++ b/gr-usrp/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ README_MULTI_USRP.txt \ gnuradio-usrp.pc.in diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 9c1f4b525..7a16fe5b1 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -22,18 +22,16 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -# ---------------------------------------------------------------- -# Misc. build/installation activities - -EXTRA_DIST = run_tests.in -DISTCLEANFILES = run_tests +TESTS = +EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA) +DISTCLEANFILES += run_tests run_guile_tests noinst_PYTHON = qa_usrp.py +if GUILE nobase_guile_DATA = gnuradio/usrp.scm - -TESTS = +endif # ---------------------------------------------------------------- # The straight C++ library @@ -109,13 +107,6 @@ usrp_swig_swiginclude_headers = \ usrp_standard.i -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - - if PYTHON TESTS += run_tests endif diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 8b94ae54f..8e1d0c20c 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -20,8 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests + # ---------------------------------------------------------------------- # Local Python files, not installed @@ -35,9 +39,6 @@ noinst_PYTHON = qa_usrp2.py # Miscellaneous build operations # ---------------------------------------------------------------------- -EXTRA_DIST = run_tests.in -DISTCLEANFILES = run_tests - # ---------------------------------------------------------------------- # C++ block API interface librar(ies) # @@ -82,14 +83,12 @@ noinst_HEADERS = \ rx_16sc_handler.h \ rx_32fc_handler.h -if PYTHON # ---------------------------------------------------------------------- -# Python SWIG wrapper around C++ library +# SWIG wrappers around C++ library # # usrp2.py # _usrp2.so # ---------------------------------------------------------------------- -TESTS += run_tests TOP_SWIG_IFILES = \ usrp2.i @@ -109,11 +108,6 @@ usrp2_swig_args = \ usrp2_la_swig_libadd = \ libgnuradio-usrp2.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif +if PYTHON +TESTS += run_tests +endif
\ No newline at end of file diff --git a/gr-utils/src/python/Makefile.am b/gr-utils/src/python/Makefile.am index 9c4e222c8..450032266 100644 --- a/gr-utils/src/python/Makefile.am +++ b/gr-utils/src/python/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ $(bin_SCRIPTS) \ README.plot \ pyqt_plot.ui \ diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index a3e9a5612..04c39542a 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -20,9 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST = run_tests.in +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \ $(WITH_INCLUDES) @@ -46,11 +48,9 @@ libgnuradio_video_sdl_la_LIBADD = \ libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON + ################################# -# SWIG interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ video_sdl.i @@ -66,11 +66,6 @@ video_sdl_pythondir_category = \ video_sdl_la_swig_libadd = \ libgnuradio-video-sdl.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am index 335ebe43f..cee66e587 100644 --- a/gr-wxgui/Makefile.am +++ b/gr-wxgui/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ gr-wxgui.pc.in \ README \ README.gl diff --git a/grc/Makefile.am b/grc/Makefile.am index 2b5dc730b..330777bb7 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008, 2009 Free Software Foundation, Inc. +# Copyright 2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,9 +41,9 @@ ourpython_PYTHON = __init__.py etcdir = $(gr_prefsdir) dist_etc_DATA = grc.conf -EXTRA_DIST = $(srcdir)/grc.conf.in +EXTRA_DIST += $(srcdir)/grc.conf.in -BUILT_SOURCES = grc.conf +BUILT_SOURCES += grc.conf grc.conf: $(srcdir)/grc.conf.in Makefile sed \ diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index f6aa97a93..dd7411bbb 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -39,8 +39,8 @@ dist_pkglibexec_SCRIPTS = grc_setup_freedesktop grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@ -EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in -BUILT_SOURCES = grc_setup_freedesktop +EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in +BUILT_SOURCES += grc_setup_freedesktop install-data-hook: @printf "\n*** GRC Post-Install Message ***\ diff --git a/gruel/Makefile.am b/gruel/Makefile.am index 93f56a7db..c43e461f2 100644 --- a/gruel/Makefile.am +++ b/gruel/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ gruel.pc.in SUBDIRS = src diff --git a/gruel/src/include/gruel/Makefile.am b/gruel/src/include/gruel/Makefile.am index 67dd12995..d7ac3d332 100644 --- a/gruel/src/include/gruel/Makefile.am +++ b/gruel/src/include/gruel/Makefile.am @@ -21,13 +21,12 @@ include $(top_srcdir)/Makefile.common -BUILT_SOURCES = \ - inet.h +EXTRA_DIST += inet.h.in gruelincludedir = $(prefix)/include/gruel gruelinclude_HEADERS = \ - $(BUILT_SOURCES) \ + inet.h \ msg_accepter.h \ msg_accepter_msgq.h \ msg_queue.h \ diff --git a/gruel/src/lib/pmt/Makefile.am b/gruel/src/lib/pmt/Makefile.am index d3efc1afa..7a1f2e7d4 100644 --- a/gruel/src/lib/pmt/Makefile.am +++ b/gruel/src/lib/pmt/Makefile.am @@ -48,7 +48,7 @@ python_built_sources = $(GENERATED_H) $(GENERATED_CC) PMT_SERIAL_TAGS_H = $(abs_top_builddir)/gruel/src/include/gruel/pmt_serial_tags.h BUILT_SOURCES = $(python_built_sources) $(PMT_SERIAL_TAGS_H) -EXTRA_DIST = $(code_generator) +EXTRA_DIST += $(code_generator) # ---------------------------------------------------------------- diff --git a/gruel/src/scheme/gnuradio/Makefile.am b/gruel/src/scheme/gnuradio/Makefile.am index 0ce01f6f8..2f8e5c8d2 100644 --- a/gruel/src/scheme/gnuradio/Makefile.am +++ b/gruel/src/scheme/gnuradio/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2009 Free Software Foundation, Inc. +# Copyright 2007,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -18,12 +18,14 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +include $(top_srcdir)/Makefile.common + #pkgdatadir = $(datadir)/gnuradio -EXTRA_DIST = \ +EXTRA_DIST += \ gen-serial-tags.scm -# really scheme source files +# really scheme source files FIXME wrong location dist_pkgdata_DATA = \ pmt-serial-tags.scm \ pmt-serialize.scm \ diff --git a/usrp/Makefile.am b/usrp/Makefile.am index c3e529da9..cde72e1eb 100644 --- a/usrp/Makefile.am +++ b/usrp/Makefile.am @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -EXTRA_DIST = \ +include $(top_srcdir)/Makefile.common + +EXTRA_DIST += \ usrp.pc.in \ usrp.iss.in \ usrp.inf diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am index 6099ebb72..0eddc623a 100644 --- a/usrp/doc/Makefile.am +++ b/usrp/doc/Makefile.am @@ -27,7 +27,7 @@ SUBDIRS = other man3dir = $(mandir)/man3 usrp_docdir = $(prefix)/share/doc/usrp-$(DOCVER) -EXTRA_DIST = \ +EXTRA_DIST += \ Doxyfile.in \ ddc.eps \ ddc.png \ diff --git a/usrp/doc/other/Makefile.am b/usrp/doc/other/Makefile.am index ca1de7ce0..815553a6d 100644 --- a/usrp/doc/other/Makefile.am +++ b/usrp/doc/other/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Free Software Foundation, Inc. +# Copyright 2005,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,5 +21,5 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ mainpage.dox diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am index 2aaf66a53..19504313b 100644 --- a/usrp/host/include/usrp/Makefile.am +++ b/usrp/host/include/usrp/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -47,10 +47,8 @@ usrpinclude_HEADERS = \ usrp_subdev_spec.h \ usrp_tune_result.h -EXTRA_DIST = \ +EXTRA_DIST += \ libusb_types.h.in -if PYTHON swiginclude_HEADERS = \ db_base.i -endif diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index b8b60fa98..96ab55821 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -42,11 +42,11 @@ libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) endif -EXTRA_DIST = \ +EXTRA_DIST += \ std_paths.h.in \ usrp_dbid.dat -BUILT_SOURCES = $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h +BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h BUILT_SOURCES += usrp_dbid.cc \ usrp_dbid.py diff --git a/usrp/host/misc/Makefile.am b/usrp/host/misc/Makefile.am index 45c940f67..935dc74b5 100644 --- a/usrp/host/misc/Makefile.am +++ b/usrp/host/misc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2003,2004 Free Software Foundation, Inc. +# Copyright 2003,2004,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ getopt.c getopt.h \ gettimeofday.c \ tempname.c mkstemp.c \ diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index c846f267b..5baeff4cb 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -20,6 +20,7 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = \ $(USRP_INCLUDES) \ @@ -53,11 +54,3 @@ usrp_prims_la_swig_libadd = \ usrp_prims_python = \ __init__.py \ usrp_fpga_regs.py - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) diff --git a/usrp2/firmware/Makefile.am b/usrp2/firmware/Makefile.am index c75136de1..a5339bb5b 100644 --- a/usrp2/firmware/Makefile.am +++ b/usrp2/firmware/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2008 Free Software Foundation, Inc. +# Copyright 2007,2008,2010 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am index d6bb4edc3..2e5f3651f 100644 --- a/usrp2/firmware/lib/Makefile.am +++ b/usrp2/firmware/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2010 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/usrp2/host/Makefile.am b/usrp2/host/Makefile.am index b6e30b5ff..13f7cb86a 100644 --- a/usrp2/host/Makefile.am +++ b/usrp2/host/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = usrp2.pc -EXTRA_DIST = \ +EXTRA_DIST += \ usrp2.pc.in SUBDIRS = include lib apps |