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-gpio/src/fpga | |
| 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-gpio/src/fpga')
| -rw-r--r-- | gr-gpio/src/fpga/include/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-gpio/src/fpga/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-gpio/src/fpga/top/Makefile.am | 2 |
3 files changed, 7 insertions, 3 deletions
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 \ |