regenerated

1 files changed, 39 insertions, 182 deletions

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 66edf9ce9..380c93366 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ comedi_pylibdir_category ?= $(comedi_pythondir_category)
 comedi_pythondir = $(pythondir)/$(comedi_pythondir_category)
 comedi_pylibdir = $(pyexecdir)/$(comedi_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.
+comedi_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/comedi
+# FIXME: determince whether these should be installed with gnuradio.
+comedi_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 comedi_swigincludedir = $(swigincludedir)
@@ -72,7 +82,12 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += comedi.py comedi_python.cc
+# generating the py or scm file also generates the .cc or .h files,
+# but dependencies work better without the .cc ort .h files listed.
+swig_built_sources += comedi.py
+if GUILE
+swig_built_sources += comedi.scm
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -83,208 +98,50 @@ comedi_swiginclude_HEADERS =		\
 	$(comedi_swiginclude_headers)
 
 comedi_pylib_LTLIBRARIES =		\
-	_comedi_python.la
+	_comedi.la
 
-_comedi_python_la_SOURCES = 		\
-	comedi_python.cc		\
+_comedi_la_SOURCES = 			\
+	python/comedi.cc		\
 	$(comedi_la_swig_sources)
 
-_comedi_python_la_LIBADD =		\
+_comedi_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(comedi_la_swig_libadd)
 
-_comedi_python_la_LDFLAGS =		\
+# _comedi_la_DEPENDENCIES = python/comedi.lo
+
+_comedi_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(comedi_la_swig_ldflags)
 
-_comedi_python_la_CXXFLAGS =		\
+_comedi_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(comedi_la_swig_cxxflags)
 
 comedi_python_PYTHON =			\
 	comedi.py			\
-	$(comedi_python)
+	$(comedi)
 
 if GUILE
-comedi_pylib_LTLIBRARIES += _comedi_guile.la
-
-_comedi_guile_la_SOURCES = 		\
-	comedi_guile.cc		\
+comedi_scmlib_LTLIBRARIES = comedi_guile.la
+comedi_guile_la_SOURCES = 		\
+	guile/comedi.cc			\
 	$(comedi_la_swig_sources)
+comedi_scm_DATA = comedi.scm
 
 # Guile can use the same flags as python does
-_comedi_guile_la_LIBADD = $(_comedi_python_la_LIBADD)
-_comedi_guile_la_LDFLAGS = $(_comedi_python_la_LDFLAGS)
-_comedi_guile_la_CXXFLAGS = $(_comedi_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+comedi_guile_la_LIBADD = $(_comedi_la_LIBADD)
+comedi_guile_la_LDFLAGS = $(_comedi_la_LDFLAGS)
+comedi_guile_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
 
-## Entry rule for running SWIG
+guile/comedi.lo: comedi.lo
+comedi.scm: comedi.i
 
-comedi.h comedi.py comedi_python.cc: comedi.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)/comedi-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)/comedi-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)/comedi-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)/comedi-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/comedi-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/comedi-generate-guile-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)/comedi-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)/comedi-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)/comedi-generate-python-stamp; \
-		exit $$?; \
-	fi;
-
-$(DEPDIR)/comedi-generate-guile-stamp:
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(comedi_swig_args) \
-		-MD -MF $(DEPDIR)/comedi.Std \
-		-module comedi -o comedi_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/comedi.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/comedi.Std \
-			> $(DEPDIR)/comedi.Sd; \
-		$(RM) $(DEPDIR)/comedi.Std; \
-		$(MV) $(DEPDIR)/comedi.Sd $(DEPDIR)/comedi.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/comedi.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/comedi-generate-guile-stamp
-
-$(DEPDIR)/comedi-generate-python-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) $(comedi_swig_args) \
-		-MD -MF $(DEPDIR)/comedi.Std \
-		-module comedi -o comedi_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/comedi.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/comedi.Std \
-			> $(DEPDIR)/comedi.Sd; \
-		$(RM) $(DEPDIR)/comedi.Std; \
-		$(MV) $(DEPDIR)/comedi.Sd $(DEPDIR)/comedi.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/comedi.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)/comedi.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/comedi.Std $(DEPDIR)/comedi.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/comedi.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)/comedi.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/comedi.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/comedi.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)/comedi-generate-python-stamp
+endif				# end of GUILE
 
-# 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.
+python/comedi.lo:
+comedi.lo: comedi.py comedi.scm
+comedi.py: comedi.i
 
-@am__include@ @am__quote@./$(DEPDIR)/comedi.d@am__quote@