From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: 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.
---
 gr-gpio/src/fpga/include/Makefile.am | 4 +++-
 gr-gpio/src/fpga/lib/Makefile.am     | 4 +++-
 gr-gpio/src/fpga/top/Makefile.am     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'gr-gpio')

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 \
-- 
cgit