From ed4094208c501e91838ccc333059e4731e8ae908 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 14 Oct 2010 12:34:08 -0600
Subject: regenerated after changes to the template

---
 gr-comedi/src/Makefile.swig.gen | 59 +++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index dd2c235c3..66edf9ce9 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -72,7 +72,7 @@ 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.cc
+swig_built_sources += comedi.py comedi_python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -83,21 +83,21 @@ comedi_swiginclude_HEADERS =		\
 	$(comedi_swiginclude_headers)
 
 comedi_pylib_LTLIBRARIES =		\
-	_comedi.la
+	_comedi_python.la
 
-_comedi_la_SOURCES = 			\
-	comedi.cc			\
+_comedi_python_la_SOURCES = 		\
+	comedi_python.cc		\
 	$(comedi_la_swig_sources)
 
-_comedi_la_LIBADD =			\
+_comedi_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(comedi_la_swig_libadd)
 
-_comedi_la_LDFLAGS =			\
+_comedi_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(comedi_la_swig_ldflags)
 
-_comedi_la_CXXFLAGS =			\
+_comedi_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(comedi_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ comedi_python_PYTHON =			\
 	comedi.py			\
 	$(comedi_python)
 
+if GUILE
+comedi_pylib_LTLIBRARIES += _comedi_guile.la
+
+_comedi_guile_la_SOURCES = 		\
+	comedi_guile.cc		\
+	$(comedi_la_swig_sources)
+
+# 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
+
 ## Entry rule for running SWIG
 
-comedi.h comedi.py comedi.cc: 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:
 ##
@@ -159,11 +173,12 @@ comedi.h comedi.py comedi.cc: comedi.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/comedi-generate-stamp; \
+		rm -f $(DEPDIR)/comedi-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/comedi-generate-stamp WHAT=$<; \
+		$(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
@@ -187,11 +202,27 @@ comedi.h comedi.py comedi.cc: comedi.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/comedi-generate-stamp; \
+		test -f $(DEPDIR)/comedi-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/comedi-generate-stamp:
+$(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
@@ -202,7 +233,7 @@ $(DEPDIR)/comedi-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(comedi_swig_args) \
 		-MD -MF $(DEPDIR)/comedi.Std \
-		-module comedi -o comedi.cc $(WHAT); then \
+		-module comedi -o comedi_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/comedi.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/comedi.Std \
@@ -249,7 +280,7 @@ $(DEPDIR)/comedi-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/comedi-generate-stamp
+	touch $(DEPDIR)/comedi-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
-- 
cgit 


From 4f67bf0a435f9eb62d66c6b2b19a096cbde412d7 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:16:22 -0600
Subject: regenerated

---
 gr-comedi/src/Makefile.swig.gen | 221 +++++++---------------------------------
 1 file changed, 39 insertions(+), 182 deletions(-)

(limited to 'gr-comedi')

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


From 1e34972f4433cbfef3500fc73a285c7c436cfd6b Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 22 Oct 2010 22:00:09 -0700
Subject: Rengenerate Makefile.swig.gen's

---
 gr-comedi/src/Makefile.swig.gen | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 380c93366..841f51805 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -41,12 +41,12 @@ 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
+comedi_scmlibdir = $(libdir)/guile/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
+comedi_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -144,4 +144,5 @@ python/comedi.lo:
 comedi.lo: comedi.py comedi.scm
 comedi.py: comedi.i
 
+-include python/comedi.d
 
-- 
cgit 


From 6421d47062f4bf5abbdf26142616a5965f1edfa0 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 22 Oct 2010 23:28:06 -0700
Subject: regenerate

---
 gr-comedi/src/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 841f51805..4bda07800 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -41,7 +41,7 @@ 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 = $(libdir)/guile/gnuradio
+comedi_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/comedi
@@ -124,16 +124,16 @@ comedi_python_PYTHON =			\
 	$(comedi)
 
 if GUILE
-comedi_scmlib_LTLIBRARIES = comedi_guile.la
-comedi_guile_la_SOURCES = 		\
+comedi_scmlib_LTLIBRARIES = libguile-comedi.la
+libguile_comedi_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_la_LIBADD)
-comedi_guile_la_LDFLAGS = $(_comedi_la_LDFLAGS)
-comedi_guile_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
+libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD)
+libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS)
+libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
 
 guile/comedi.lo: comedi.lo
 comedi.scm: comedi.i
-- 
cgit 


From d94769a975612072dc03fa378bc79856c07cd66b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 30 Oct 2010 12:14:41 -0600
Subject: add load-extension support

---
 gr-comedi/src/comedi.i | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i
index cdb77aee0..499ccc598 100644
--- a/gr-comedi/src/comedi.i
+++ b/gr-comedi/src/comedi.i
@@ -69,3 +69,13 @@ class comedi_sink_s : public gr_sync_block {
  public:
   ~comedi_sink_s ();
 };
+
+#if SWIGGUILE
+%scheme %{
+(load-extension "libguile-comedi" "scm_init_gnuradio_comedi_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
-- 
cgit 


From 8c80b814bcdc00e0e71a1d4174c747a0f221fa20 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 13:23:26 -0700
Subject: regenerated

---
 gr-comedi/src/Makefile.swig.gen | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 4bda07800..06be4769e 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ comedi_scmlibdir = $(libdir)
 # 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 = $(guiledir)/gnuradio
+comedi_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ comedi_scmlib_LTLIBRARIES = libguile-comedi.la
 libguile_comedi_la_SOURCES = 		\
 	guile/comedi.cc			\
 	$(comedi_la_swig_sources)
-comedi_scm_DATA = comedi.scm
+nobase_comedi_scm_DATA = gnuradio/comedi.scm gnuradio/comedi-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
 
 guile/comedi.lo: comedi.lo
 comedi.scm: comedi.i
+gnuradio/comedi-primitive.scm: comedi.scm
+
+-include guile/comedi.d
 
 endif				# end of GUILE
 
-- 
cgit 


From bc8fd41b84219cd08f057c524fe0b90ffef6f8aa Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 1 Nov 2010 16:28:14 -0700
Subject: regenerated

---
 gr-comedi/src/Makefile.swig.gen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 06be4769e..8fab4212b 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # 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
+# swig_built_sources += comedi.py
+# if GUILE
+# swig_built_sources += gnuradio/comedi.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD)
 libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS)
 libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
 
-guile/comedi.lo: comedi.lo
-comedi.scm: comedi.i
-gnuradio/comedi-primitive.scm: comedi.scm
+guile/comedi.cc: gnuradio/comedi.scm
+gnuradio/comedi.scm: comedi.i
+gnuradio/comedi-primitive.scm: gnuradio/comedi.scm
 
 -include guile/comedi.d
 
 endif				# end of GUILE
 
-python/comedi.lo:
 comedi.lo: comedi.py comedi.scm
 comedi.py: comedi.i
 
-- 
cgit 


From df92b7c6315c567e58e0d9c293d7c9c2699023d3 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 10 Nov 2010 13:01:38 -0800
Subject: regenerated

---
 gr-comedi/src/Makefile.swig.gen | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 8fab4212b..f52a9a25c 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ comedi_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)/comedi-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 .
-
-# 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 += gnuradio/comedi.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _comedi_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(comedi_la_swig_libadd)
 
-# _comedi_la_DEPENDENCIES = python/comedi.lo
-
 _comedi_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(comedi_la_swig_ldflags)
@@ -123,14 +103,20 @@ comedi_python_PYTHON =			\
 	comedi.py			\
 	$(comedi)
 
+python/comedi.cc: comedi.py
+comedi.py: comedi.i
+
+# Include the python dependencies for this file
+-include python/comedi.d
+# end of PYTHON
+
 if GUILE
 comedi_scmlib_LTLIBRARIES = libguile-comedi.la
-libguile_comedi_la_SOURCES = 		\
+libguile_comedi_la_SOURCES =		\
 	guile/comedi.cc			\
 	$(comedi_la_swig_sources)
 nobase_comedi_scm_DATA = gnuradio/comedi.scm gnuradio/comedi-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD)
 libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS)
 libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/comedi.cc: gnuradio/comedi.scm
 gnuradio/comedi.scm: comedi.i
 gnuradio/comedi-primitive.scm: gnuradio/comedi.scm
 
+# Include the guile dependencies for this file
 -include guile/comedi.d
 
 endif				# end of GUILE
 
-comedi.lo: comedi.py comedi.scm
-comedi.py: comedi.i
-
--include python/comedi.d
 
-- 
cgit 


From 8180bb1d7020e07c9b0a217820c68d07f0d98a74 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 16 Nov 2010 21:33:50 -0800
Subject: regenerated

---
 gr-comedi/src/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index f52a9a25c..6007d1216 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -101,7 +101,7 @@ _comedi_la_CXXFLAGS =			\
 
 comedi_python_PYTHON =			\
 	comedi.py			\
-	$(comedi)
+	$(comedi_python)
 
 python/comedi.cc: comedi.py
 comedi.py: comedi.i
-- 
cgit 


From ff877cabe2384dc2155ef5af92ee8b959fd29806 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Fri, 19 Nov 2010 08:07:52 -0700
Subject: regenerated

---
 gr-comedi/src/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 6007d1216..9b34dacce 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -79,6 +79,7 @@ comedi_swiginclude_HEADERS =		\
 	comedi.i			\
 	$(comedi_swiginclude_headers)
 
+if PYTHON
 comedi_pylib_LTLIBRARIES =		\
 	_comedi.la
 
@@ -86,6 +87,10 @@ _comedi_la_SOURCES = 			\
 	python/comedi.cc		\
 	$(comedi_la_swig_sources)
 
+comedi_python_PYTHON =			\
+	comedi.py			\
+	$(comedi_python)
+
 _comedi_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(comedi_la_swig_libadd)
@@ -99,27 +104,34 @@ _comedi_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(comedi_la_swig_cxxflags)
 
-comedi_python_PYTHON =			\
-	comedi.py			\
-	$(comedi_python)
-
 python/comedi.cc: comedi.py
 comedi.py: comedi.i
 
 # Include the python dependencies for this file
 -include python/comedi.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-comedi_scmlib_LTLIBRARIES = libguile-comedi.la
+
+comedi_scmlib_LTLIBRARIES = 		\
+	libguile-comedi.la
 libguile_comedi_la_SOURCES =		\
 	guile/comedi.cc			\
 	$(comedi_la_swig_sources)
-nobase_comedi_scm_DATA = gnuradio/comedi.scm gnuradio/comedi-primitive.scm
-
-libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD)
-libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS)
-libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS)
+nobase_comedi_scm_DATA = 		\
+	gnuradio/comedi.scm 		\
+	gnuradio/comedi-primitive.scm
+libguile_comedi_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(comedi_la_swig_libadd)
+libguile_comedi_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(comedi_la_swig_ldflags)
+libguile_comedi_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(comedi_la_swig_cxxflags)
 
 guile/comedi.cc: gnuradio/comedi.scm
 gnuradio/comedi.scm: comedi.i
-- 
cgit 


From 99dc38c8f81fe388b13bf46e3f53cc272765249e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 13:49:59 -0800
Subject: Consistently use TESTS += in conditionals

---
 gr-comedi/src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index a55bd175b..dd759d8a0 100644
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
@@ -52,7 +53,7 @@ libgnuradio_comedi_la_LDFLAGS =	$(NO_UNDEFINED) $(LTVERSIONFLAGS)
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =		\
-- 
cgit 


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-comedi/src/Makefile.am | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index dd759d8a0..47f689adb 100644
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2008,2009 Free Software Foundation, Inc.
+# Copyright 2005,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,9 +20,12 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 TESTS =
-EXTRA_DIST = run_tests.in
+EXTRA_DIST += run_tests.in
+DISTCLEANFILES += run_tests
+
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
@@ -50,11 +53,8 @@ libgnuradio_comedi_la_LIBADD =	\
 
 libgnuradio_comedi_la_LDFLAGS =	$(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-if PYTHON
 ###################################
-# SWIG Python interface and library
-TESTS += run_tests
-DISTCLEANFILES = run_tests
+# SWIG interfaces and libraries
 
 TOP_SWIG_IFILES =		\
 	comedi.i
@@ -70,11 +70,6 @@ comedi_pythondir_category =	\
 comedi_la_swig_libadd =		\
 	libgnuradio-comedi.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)
+if PYTHON
+TESTS += run_tests
 endif
-- 
cgit 


From b005e7d9f481ed39591d97ef697621368e6505c0 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 19:08:21 -0800
Subject: Update .gitignore's

---
 gr-comedi/src/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/.gitignore b/gr-comedi/src/.gitignore
index d95b6dc4f..c43df1bab 100644
--- a/gr-comedi/src/.gitignore
+++ b/gr-comedi/src/.gitignore
@@ -10,3 +10,6 @@
 /*.pyc
 /comedi.py
 /run_tests
+/gnuradio
+/guile
+/python
-- 
cgit 


From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:30:54 -0800
Subject: Rename libguile- to libguile-gnuradio- to match guile library naming
 convention.

The stuff in gnuradio-core ends up with funky names, but that could
be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc.
---
 gr-comedi/src/comedi.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i
index 499ccc598..dadb57e90 100644
--- a/gr-comedi/src/comedi.i
+++ b/gr-comedi/src/comedi.i
@@ -72,7 +72,7 @@ class comedi_sink_s : public gr_sync_block {
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-comedi" "scm_init_gnuradio_comedi_module")
+(load-extension "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module")
 %}
 
 %goops %{
-- 
cgit 


From 6df0423fe1880f5c33daa333604552ea68ac9593 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:34:24 -0800
Subject: Regenerated Makefile.swig.gen's

---
 gr-comedi/src/Makefile.swig.gen | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen
index 9b34dacce..cf55aa8ad 100644
--- a/gr-comedi/src/Makefile.swig.gen
+++ b/gr-comedi/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 comedi_scmlib_LTLIBRARIES = 		\
-	libguile-comedi.la
-libguile_comedi_la_SOURCES =		\
+	libguile-gnuradio-comedi.la
+libguile_gnuradio_comedi_la_SOURCES =	\
 	guile/comedi.cc			\
 	$(comedi_la_swig_sources)
 nobase_comedi_scm_DATA = 		\
 	gnuradio/comedi.scm 		\
 	gnuradio/comedi-primitive.scm
-libguile_comedi_la_LIBADD = 		\
+libguile_gnuradio_comedi_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(comedi_la_swig_libadd)
-libguile_comedi_la_LDFLAGS = 		\
+libguile_gnuradio_comedi_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(comedi_la_swig_ldflags)
-libguile_comedi_la_CXXFLAGS = 		\
+libguile_gnuradio_comedi_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(comedi_la_swig_cxxflags)
-- 
cgit 


From 08907ee94fb6c34531d57b988324c67c26c8b747 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 10 Dec 2010 16:15:40 -0800
Subject: Use load-extension-global instead of load-extension

---
 gr-comedi/src/comedi.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-comedi')

diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i
index dadb57e90..36865afbe 100644
--- a/gr-comedi/src/comedi.i
+++ b/gr-comedi/src/comedi.i
@@ -72,7 +72,7 @@ class comedi_sink_s : public gr_sync_block {
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module")
+(load-extension-global "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module")
 %}
 
 %goops %{
-- 
cgit