4 files changed, 7 insertions, 31 deletions
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)