diff options
| author | Tom Rondeau | 2011-03-20 12:31:10 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-03-20 12:31:10 -0400 |
| commit | 972fc99ad6984e50731ec0dd97ccfec71829139b (patch) | |
| tree | dcbbe06ca254169c122b88600816e504643880dc /gr-gpio | |
| parent | 3c3aff088447942053e96ae30b766b00d4cd0202 (diff) | |
| parent | 4d1426b8db5be20583a6efb380d564a55a28fd09 (diff) | |
| download | gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.tar.gz gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.tar.bz2 gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-gpio')
| -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 \ |