make howto build the new way

5 files changed, 181 insertions, 363 deletions

diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common
index 15a521698..0787b4eec 100644
--- a/gr-howto-write-a-block/Makefile.common
+++ b/gr-howto-write-a-block/Makefile.common
@@ -23,6 +23,10 @@
 # The name of this "out-of-tree" module
 modname = howto
 
+# Make rebuilds less verbose with stuff we can safely ignore
+# about GNU make only extensions.
+AUTOMAKE += -Wno-portability -Wnone
+
 # these flags are used when compiling non-SWIG-wrapper files
 # when going in to non-SWIG libraries
 AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
@@ -69,6 +73,36 @@ RM=$(RM_PROG) -f
 STAMPS =
 MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
 
+## SWIG suffixes for automake to know about
+SUFFIXES = .i .scm .py
+
+if GUILE
+# Compile a .i to what guile needs. We use -o to set the output file name,
+# or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a 
+# gnuradio_core_*_wrap.cxx in the source directory.
+gnuradio/%.scm : %.i
+	@echo "Compile .i to .scm"
+	@test -d "guile" || $(mkinstalldirs) "guile"
+	@test -d "gnuradio" || $(mkinstalldirs) "gnuradio"
+	$(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \
+		-MD -MF guile/$*.Std \
+		-module $* -o guile/$*.cc $<
+	$(SED) -e 's|guile/\(.*\)\.cc:|gnuradio/\1.scm:|' guile/$*.Std > guile/$*.d
+	$(SED) -i -e 's/<--dummy-[0-9]\+-->/<top>/g' gnuradio/$*.scm
+	$(SED) -i -e 's/^(export /(export-safely /' gnuradio/$*.scm
+	$(RM) guile/$*.Std
+endif
+
+# Compile a .i file to what python needs
+.i.py:
+	@echo "Compile .i to .py"
+	@test -d "python" || $(mkinstalldirs) "python"
+	$(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \
+		-MD -MF python/$*.Std \
+		-module $* -o python/$*.cc -oh python/$*.h $<
+	$(SED) -e 's|python/\(.*\)\.cc:|\1.py:|' python/$*.Std > python/$*.d
+	$(RM) python/$*.Std
+
 # Don't distribute the files defined in the variable 'no_dist_files'
 dist-hook:
 	@for file in $(no_dist_files); do \
diff --git a/gr-howto-write-a-block/Makefile.swig b/gr-howto-write-a-block/Makefile.swig
index 9e14835e5..231ae4ebe 100644
--- a/gr-howto-write-a-block/Makefile.swig
+++ b/gr-howto-write-a-block/Makefile.swig
@@ -32,6 +32,9 @@
 ##   In some older autotools, $(builddir) is not defined, so
 ##   just use '.' instead.
 
+CLEANFILES = python/*.cc python/*.h python/*.lo python/*.o
+CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.lo guile/*.o
+
 SWIG_PYTHON_FLAGS =	\
 	-fvirtual	\
 	-python		\
@@ -40,14 +43,34 @@ SWIG_PYTHON_FLAGS =	\
 	-w511		\
 	-outdir .
 
-## standard swig flags used by most components
-
 STD_SWIG_PYTHON_ARGS =				\
 	$(SWIG_PYTHON_FLAGS)			\
 	$(STD_DEFINES_AND_INCLUDES)		\
 	$(WITH_SWIG_INCLUDES)			\
 	$(WITH_INCLUDES)
 
+# NOTE: -Linkage passive and -Linkage module don't define SWIG_init()
+SWIG_GUILE_FLAGS =	\
+	-guile		\
+	-scm		\
+	-scmstub	\
+	-package gnuradio \
+	-Linkage module \
+	-proxy \
+	-goopsprefix gr: \
+	-emit-slot-accessors \
+	-emit-setters \
+	-outdir .
+
+## standard swig flags used by most components
+
+STD_SWIG_GUILE_ARGS =				\
+	$(SWIG_GUILE_FLAGS)			\
+	$(STD_DEFINES_AND_INCLUDES)		\
+	$(WITH_SWIG_INCLUDES)			\
+	$(WITH_INCLUDES)			\
+	-I$(GNURADIO_CORE_INCLUDEDIR)/swig/guile
+
 ## standard SWIG LD flags for library creation
 
 STD_SWIG_LA_LD_FLAGS =		\
@@ -58,8 +81,7 @@ STD_SWIG_LA_LD_FLAGS =		\
 
 ## standard SWIG library additions for library creation
 
-STD_SWIG_LA_LIB_ADD =  		\
-	-lstdc++
+STD_SWIG_LA_LIB_ADD = -lstdc++
 
 ## standard SWIG CXXFLAGS
 ## This allows for code to be compiled with "-O1" instead of "-g -O2"
@@ -67,10 +89,6 @@ STD_SWIG_LA_LIB_ADD =  		\
 
 STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@
 
-## SWIG suffix for automake to know about
-
-SUFFIXES = .i
-
 ## Create $(srcdir)/Makefile.swig.gen, containing all of the rules
 ## for running SWIG to generate or re-generate outputs.  SWIG file
 ## names are to be defined in TOP_SWIG_IFILES, and must include the
@@ -115,3 +133,4 @@ swig_built_sources =
 ## on variables defined above.
 
 include $(srcdir)/Makefile.swig.gen
+
diff --git a/gr-howto-write-a-block/Makefile.swig.gen.t b/gr-howto-write-a-block/Makefile.swig.gen.t
index 686117f83..9603ec3a5 100644
--- a/gr-howto-write-a-block/Makefile.swig.gen.t
+++ b/gr-howto-write-a-block/Makefile.swig.gen.t
@@ -25,16 +25,28 @@
 ## Default install locations for these files:
 ##
 ## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/@NAME@
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/@NAME@
 ## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/@NAME@
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/@NAME@
 ##
 ## The following can be overloaded to change the install location, but
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-@NAME@_pythondir = $(pythondir)/@NAME@
-@NAME@_pylibdir = $(pyexecdir)/@NAME@
+@NAME@_pythondir_category ?= gnuradio/@NAME@
+@NAME@_pylibdir_category ?= $(@NAME@_pythondir_category)
+@NAME@_pythondir = $(pythondir)/$(@NAME@_pythondir_category)
+@NAME@_pylibdir = $(pyexecdir)/$(@NAME@_pylibdir_category)
+
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+@NAME@_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/@NAME@
+# FIXME: determince whether these should be installed with gnuradio.
+@NAME@_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -55,23 +67,10 @@
 ## right thing.  For more info, see <
 ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
 
-## Stamps used to ensure parallel make does the right thing.  These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built.  These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/@NAME@-generate-*
-
 ## Other cleaned files: dependency files generated by SWIG or this Makefile
 
 MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
-## Add the .py and .cc files to the list of SWIG built sources.  The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-swig_built_sources += @NAME@_swig.py @NAME@_swig.cc
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -81,176 +80,53 @@ swig_built_sources += @NAME@_swig.py @NAME@_swig.cc
 	$(@NAME@_swiginclude_headers)
 
 @NAME@_pylib_LTLIBRARIES =		\
-	_@NAME@_swig.la
+	_@NAME@.la
 
-_@NAME@_swig_la_SOURCES = 		\
-	@NAME@_swig.cc			\
+_@NAME@_la_SOURCES = 			\
+	python/@NAME@.cc		\
 	$(@NAME@_la_swig_sources)
 
-_@NAME@_swig_la_LIBADD =		\
+_@NAME@_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(@NAME@_la_swig_libadd)
 
-_@NAME@_swig_la_LDFLAGS =		\
+_@NAME@_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(@NAME@_la_swig_ldflags)
 
-_@NAME@_swig_la_CXXFLAGS =		\
+_@NAME@_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(@NAME@_la_swig_cxxflags)
 
 @NAME@_python_PYTHON =			\
-	@NAME@_swig.py			\
-	$(@NAME@_python)
+	@NAME@.py			\
+	$(@NAME@)
 
-## Entry rule for running SWIG
+python/@NAME@.cc: @NAME@.py
+@NAME@.py: @NAME@.i
 
-@NAME@.h @NAME@_swig.py @NAME@_swig.cc: @NAME@.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/@NAME@-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/@NAME@-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/@NAME@-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/@NAME@-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/@NAME@-generate-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/@NAME@-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/@NAME@-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/@NAME@-generate-stamp; \
-		exit $$?; \
-	fi;
+# Include the python dependencies for this file
+-include python/@NAME@.d
+# end of PYTHON
 
-$(DEPDIR)/@NAME@-generate-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(@NAME@_swig_args) \
-		-MD -MF $(DEPDIR)/@NAME@.Std \
-		-module @NAME@_swig -o @NAME@_swig.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/@NAME@.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/@NAME@.Std \
-			> $(DEPDIR)/@NAME@.Sd; \
-		$(RM) $(DEPDIR)/@NAME@.Std; \
-		$(MV) $(DEPDIR)/@NAME@.Sd $(DEPDIR)/@NAME@.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/@NAME@.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) $(DEPDIR)/@NAME@.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/@NAME@.Std $(DEPDIR)/@NAME@.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/@NAME@.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/@NAME@.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/@NAME@.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/@NAME@.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/@NAME@-generate-stamp
+if GUILE
+@NAME@_scmlib_LTLIBRARIES = libguile-@NAME@.la
+libguile_@NAME@_la_SOURCES =		\
+	guile/@NAME@.cc			\
+	$(@NAME@_la_swig_sources)
+nobase_@NAME@_scm_DATA = gnuradio/@NAME@.scm gnuradio/@NAME@-primitive.scm
+
+libguile_@NAME@_la_LIBADD = $(_@NAME@_la_LIBADD)
+libguile_@NAME@_la_LDFLAGS = $(_@NAME@_la_LDFLAGS)
+libguile_@NAME@_la_CXXFLAGS = $(_@NAME@_la_CXXFLAGS)
+
+guile/@NAME@.cc: gnuradio/@NAME@.scm
+gnuradio/@NAME@.scm: @NAME@.i
+gnuradio/@NAME@-primitive.scm: gnuradio/@NAME@.scm
+
+# Include the guile dependencies for this file
+-include guile/@NAME@.d
 
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
+endif				# end of GUILE
 
-@am__include@ @am__quote@./$(DEPDIR)/@NAME@.d@am__quote@
diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am
index 4737ad619..a57834683 100644
--- a/gr-howto-write-a-block/swig/Makefile.am
+++ b/gr-howto-write-a-block/swig/Makefile.am
@@ -20,8 +20,19 @@
 # 
 
 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
+AM_CPPFLAGS += -I$(top_srcdir)/lib 
+
+swig_built_sources =
 
 if PYTHON
 ###################################
@@ -34,21 +45,23 @@ TOP_SWIG_IFILES = \
 #   import howto
 # This ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/$(modname)
-
 howto_la_swig_libadd =		\
 	$(top_builddir)/lib/libgnuradio-howto.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)
-
 # additional SWIG files to be installed
-howto_swiginclude_headers = \
+aqhowto_swiginclude_headers = \
 	howto_square_ff.i \
 	howto_square2_ff.i
 
+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)
+
diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen
index 6c6e66290..b42bd12a3 100644
--- a/gr-howto-write-a-block/swig/Makefile.swig.gen
+++ b/gr-howto-write-a-block/swig/Makefile.swig.gen
@@ -25,16 +25,28 @@
 ## Default install locations for these files:
 ##
 ## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/howto
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/howto
 ## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/howto
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/howto
 ##
 ## The following can be overloaded to change the install location, but
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-howto_pythondir = $(pythondir)/howto
-howto_pylibdir = $(pyexecdir)/howto
+howto_pythondir_category ?= gnuradio/howto
+howto_pylibdir_category ?= $(howto_pythondir_category)
+howto_pythondir = $(pythondir)/$(howto_pythondir_category)
+howto_pylibdir = $(pyexecdir)/$(howto_pylibdir_category)
+
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+howto_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/howto
+# FIXME: determince whether these should be installed with gnuradio.
+howto_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -55,23 +67,10 @@ howto_swigincludedir = $(swigincludedir)
 ## right thing.  For more info, see <
 ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
 
-## Stamps used to ensure parallel make does the right thing.  These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built.  These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/howto-generate-*
-
 ## Other cleaned files: dependency files generated by SWIG or this Makefile
 
 MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
-## Add the .py and .cc files to the list of SWIG built sources.  The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-swig_built_sources += howto_swig.py howto_swig.cc
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -81,177 +80,54 @@ howto_swiginclude_HEADERS =		\
 	$(howto_swiginclude_headers)
 
 howto_pylib_LTLIBRARIES =		\
-	_howto_swig.la
+	_howto.la
 
-_howto_swig_la_SOURCES = 		\
-	howto_swig.cc			\
+_howto_la_SOURCES = 			\
+	python/howto.cc		\
 	$(howto_la_swig_sources)
 
-_howto_swig_la_LIBADD =		\
+_howto_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(howto_la_swig_libadd)
 
-_howto_swig_la_LDFLAGS =		\
+_howto_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(howto_la_swig_ldflags)
 
-_howto_swig_la_CXXFLAGS =		\
+_howto_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(howto_la_swig_cxxflags)
 
 howto_python_PYTHON =			\
-	howto_swig.py			\
-	$(howto_python)
+	howto.py			\
+	$(howto)
 
-## Entry rule for running SWIG
+python/howto.cc: howto.py
+howto.py: howto.i
 
-howto.h howto_swig.py howto_swig.cc: howto.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/howto-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/howto-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/howto-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/howto-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/howto-generate-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/howto-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/howto-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/howto-generate-stamp; \
-		exit $$?; \
-	fi;
+# Include the python dependencies for this file
+-include python/howto.d
+# end of PYTHON
 
-$(DEPDIR)/howto-generate-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(howto_swig_args) \
-		-MD -MF $(DEPDIR)/howto.Std \
-		-module howto_swig -o howto_swig.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/howto.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/howto.Std \
-			> $(DEPDIR)/howto.Sd; \
-		$(RM) $(DEPDIR)/howto.Std; \
-		$(MV) $(DEPDIR)/howto.Sd $(DEPDIR)/howto.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/howto.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) $(DEPDIR)/howto.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/howto.Std $(DEPDIR)/howto.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/howto.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/howto.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/howto.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/howto.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/howto-generate-stamp
+if GUILE
+howto_scmlib_LTLIBRARIES = libguile-howto.la
+libguile_howto_la_SOURCES =		\
+	guile/howto.cc			\
+	$(howto_la_swig_sources)
+nobase_howto_scm_DATA = gnuradio/howto.scm gnuradio/howto-primitive.scm
+
+libguile_howto_la_LIBADD = $(_howto_la_LIBADD)
+libguile_howto_la_LDFLAGS = $(_howto_la_LDFLAGS)
+libguile_howto_la_CXXFLAGS = $(_howto_la_CXXFLAGS)
+
+guile/howto.cc: gnuradio/howto.scm
+gnuradio/howto.scm: howto.i
+gnuradio/howto-primitive.scm: gnuradio/howto.scm
+
+# Include the guile dependencies for this file
+-include guile/howto.d
 
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
+endif				# end of GUILE
 
-@am__include@ @am__quote@./$(DEPDIR)/howto.d@am__quote@