From 7c23fd43214e8a729b3022db281dc85040f0e749 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 26 Feb 2010 15:17:38 -0800
Subject: Created simple source (with nothing in it) and some swig build stuff.
 Seems to work and compile

---
 gr-uhd/swig/Makefile.swig.gen | 259 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 259 insertions(+)
 create mode 100644 gr-uhd/swig/Makefile.swig.gen

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
new file mode 100644
index 000000000..3804461a4
--- /dev/null
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -0,0 +1,259 @@
+# -*- Makefile -*-
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+# Makefile.swig.gen for uhd_swig.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/uhd_swig
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/uhd_swig
+##
+## 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.
+
+uhd_swig_pythondir_category ?= gnuradio/uhd_swig
+uhd_swig_pylibdir_category ?= $(uhd_swig_pythondir_category)
+uhd_swig_pythondir = $(pythondir)/$(uhd_swig_pythondir_category)
+uhd_swig_pylibdir = $(pyexecdir)/$(uhd_swig_pylibdir_category)
+
+## SWIG headers are always installed into the same directory.
+
+uhd_swig_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen").  By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## 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)/uhd_swig-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 += uhd_swig.py uhd_swig.cc
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+uhd_swig_swiginclude_HEADERS =		\
+	uhd_swig.i			\
+	$(uhd_swig_swiginclude_headers)
+
+uhd_swig_pylib_LTLIBRARIES =		\
+	_uhd_swig.la
+
+_uhd_swig_la_SOURCES = 			\
+	uhd_swig.cc			\
+	$(uhd_swig_la_swig_sources)
+
+_uhd_swig_la_LIBADD =			\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(uhd_swig_la_swig_libadd)
+
+_uhd_swig_la_LDFLAGS =			\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(uhd_swig_la_swig_ldflags)
+
+_uhd_swig_la_CXXFLAGS =			\
+	$(STD_SWIG_CXX_FLAGS)		\
+	$(uhd_swig_la_swig_cxxflags)
+
+uhd_swig_python_PYTHON =			\
+	uhd_swig.py			\
+	$(uhd_swig_python)
+
+## Entry rule for running SWIG
+
+uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.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)/uhd_swig-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)/uhd_swig-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)/uhd_swig-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)/uhd_swig-generate-stamp; \
+##
+## Tell MAKE to run the rule for creating this stamp.
+##
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-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)/uhd_swig-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)/uhd_swig-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)/uhd_swig-generate-stamp; \
+		exit $$?; \
+	fi;
+
+$(DEPDIR)/uhd_swig-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) $(uhd_swig_swig_args) \
+		-MD -MF $(DEPDIR)/uhd_swig.Std \
+		-module uhd_swig -o uhd_swig.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/uhd_swig.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
+			> $(DEPDIR)/uhd_swig.Sd; \
+		$(RM) $(DEPDIR)/uhd_swig.Std; \
+		$(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/uhd_swig.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)/uhd_swig.d
+##
+## (2) Copy the whole SWIG file:
+##
+	cp $(DEPDIR)/uhd_swig.Std $(DEPDIR)/uhd_swig.d
+##
+## (3) all a carriage return to the end of the dependency file.
+##
+	echo "" >> $(DEPDIR)/uhd_swig.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)/uhd_swig.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig.d
+##
+## (5) remove the SWIG-generated file
+##
+	$(RM) $(DEPDIR)/uhd_swig.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)/uhd_swig-generate-stamp
+
+# 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.
+
+@am__include@ @am__quote@./$(DEPDIR)/uhd_swig.d@am__quote@
+
-- 
cgit 


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-uhd/swig/Makefile.swig.gen | 59 +++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 3804461a4..36475a12e 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/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 += uhd_swig.py uhd_swig.cc
+swig_built_sources += uhd_swig.py uhd_swig_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 @@ uhd_swig_swiginclude_HEADERS =		\
 	$(uhd_swig_swiginclude_headers)
 
 uhd_swig_pylib_LTLIBRARIES =		\
-	_uhd_swig.la
+	_uhd_swig_python.la
 
-_uhd_swig_la_SOURCES = 			\
-	uhd_swig.cc			\
+_uhd_swig_python_la_SOURCES = 		\
+	uhd_swig_python.cc		\
 	$(uhd_swig_la_swig_sources)
 
-_uhd_swig_la_LIBADD =			\
+_uhd_swig_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(uhd_swig_la_swig_libadd)
 
-_uhd_swig_la_LDFLAGS =			\
+_uhd_swig_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(uhd_swig_la_swig_ldflags)
 
-_uhd_swig_la_CXXFLAGS =			\
+_uhd_swig_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(uhd_swig_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ uhd_swig_python_PYTHON =			\
 	uhd_swig.py			\
 	$(uhd_swig_python)
 
+if GUILE
+uhd_swig_pylib_LTLIBRARIES += _uhd_swig_guile.la
+
+_uhd_swig_guile_la_SOURCES = 		\
+	uhd_swig_guile.cc		\
+	$(uhd_swig_la_swig_sources)
+
+# Guile can use the same flags as python does
+_uhd_swig_guile_la_LIBADD = $(_uhd_swig_python_la_LIBADD)
+_uhd_swig_guile_la_LDFLAGS = $(_uhd_swig_python_la_LDFLAGS)
+_uhd_swig_guile_la_CXXFLAGS = $(_uhd_swig_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i
+uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.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 @@ uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/uhd_swig-generate-stamp; \
+		rm -f $(DEPDIR)/uhd_swig-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-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 @@ uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/uhd_swig-generate-stamp; \
+		test -f $(DEPDIR)/uhd_swig-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/uhd_swig-generate-stamp:
+$(DEPDIR)/uhd_swig-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(uhd_swig_swig_args) \
+		-MD -MF $(DEPDIR)/uhd_swig.Std \
+		-module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/uhd_swig.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
+			> $(DEPDIR)/uhd_swig.Sd; \
+		$(RM) $(DEPDIR)/uhd_swig.Std; \
+		$(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+
+$(DEPDIR)/uhd_swig-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)/uhd_swig-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(uhd_swig_swig_args) \
 		-MD -MF $(DEPDIR)/uhd_swig.Std \
-		-module uhd_swig -o uhd_swig.cc $(WHAT); then \
+		-module uhd_swig -o uhd_swig_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/uhd_swig.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
@@ -249,7 +280,7 @@ $(DEPDIR)/uhd_swig-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/uhd_swig-generate-stamp
+	touch $(DEPDIR)/uhd_swig-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 f97d37a216d1a3ff888f8b57c0090f9def9dd021 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 18 Oct 2010 19:24:49 -0700
Subject: Update generated files

---
 gr-uhd/swig/Makefile.swig.gen | 112 ++++++++++++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 32 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 36475a12e..d10f6baa5 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ uhd_swig_pylibdir_category ?= $(uhd_swig_pythondir_category)
 uhd_swig_pythondir = $(pythondir)/$(uhd_swig_pythondir_category)
 uhd_swig_pylibdir = $(pyexecdir)/$(uhd_swig_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.
+uhd_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/uhd_swig
+# FIXME: determince whether these should be installed with gnuradio.
+uhd_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 uhd_swig_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += uhd_swig.py uhd_swig_python.cc
+if GUILE
+swig_built_sources += uhd_swig.scm uhd_swig_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -106,11 +119,11 @@ uhd_swig_python_PYTHON =			\
 	$(uhd_swig_python)
 
 if GUILE
-uhd_swig_pylib_LTLIBRARIES += _uhd_swig_guile.la
-
+uhd_swig_scmlib_LTLIBRARIES = _uhd_swig_guile.la
 _uhd_swig_guile_la_SOURCES = 		\
-	uhd_swig_guile.cc		\
+	uhd_swig_guile.cc		        \
 	$(uhd_swig_la_swig_sources)
+uhd_swig_scm_DATA = uhd_swig.scm
 
 # Guile can use the same flags as python does
 _uhd_swig_guile_la_LIBADD = $(_uhd_swig_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
+# $(python_deps) $(guile_deps): uhd_swig.i
+uhd_swig_python.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -178,7 +192,6 @@ uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-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
@@ -206,21 +219,23 @@ uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/uhd_swig-generate-guile-stamp:
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(uhd_swig_swig_args) \
-		-MD -MF $(DEPDIR)/uhd_swig.Std \
-		-module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/uhd_swig.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
-			> $(DEPDIR)/uhd_swig.Sd; \
-		$(RM) $(DEPDIR)/uhd_swig.Std; \
-		$(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \
-	    fi; \
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+uhd_swig_guile.h uhd_swig.scm uhd_swig_guile.cc: uhd_swig.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/uhd_swig-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/uhd_swig-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/uhd_swig-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/uhd_swig-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \
+		while test -d $(DEPDIR)/uhd_swig-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/uhd_swig-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+endif				# end of GUILE
 
 $(DEPDIR)/uhd_swig-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -232,17 +247,17 @@ $(DEPDIR)/uhd_swig-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(uhd_swig_swig_args) \
-		-MD -MF $(DEPDIR)/uhd_swig.Std \
+		-MD -MF $(DEPDIR)/uhd_swig_python.Std \
 		-module uhd_swig -o uhd_swig_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/uhd_swig.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
-			> $(DEPDIR)/uhd_swig.Sd; \
-		$(RM) $(DEPDIR)/uhd_swig.Std; \
-		$(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \
+		$(RM) $(DEPDIR)/uhd_swig_python.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig_python.Std \
+			> $(DEPDIR)/uhd_swig_python.Sd; \
+		$(RM) $(DEPDIR)/uhd_swig_python.Std; \
+		$(MV) $(DEPDIR)/uhd_swig_python.Sd $(DEPDIR)/uhd_swig_python.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \
+	    $(RM) $(DEPDIR)/uhd_swig_python.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -254,27 +269,27 @@ $(DEPDIR)/uhd_swig-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/uhd_swig.d
+	$(RM) $(DEPDIR)/uhd_swig_python.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/uhd_swig.Std $(DEPDIR)/uhd_swig.d
+	cp $(DEPDIR)/uhd_swig_python.Std $(DEPDIR)/uhd_swig_python.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/uhd_swig.d
+	echo "" >> $(DEPDIR)/uhd_swig_python.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)/uhd_swig.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig_python.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig_python.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/uhd_swig.Std
+	$(RM) $(DEPDIR)/uhd_swig_python.Std
 ##
 ## Create the stamp for this filename generation, to signal success in
 ## executing this rule; allows other threads waiting on this process
@@ -286,5 +301,38 @@ $(DEPDIR)/uhd_swig-generate-python-stamp:
 # not guaranteed to be portable, but will probably work.  If it works,
 # we have accurate dependencies for our swig stuff, which is good.
 
-@am__include@ @am__quote@./$(DEPDIR)/uhd_swig.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/uhd_swig_python.d@am__quote@
+
+if GUILE
+$(DEPDIR)/uhd_swig-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(uhd_swig_swig_args) \
+		-MD -MF $(DEPDIR)/uhd_swig_guile.Std \
+		-module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/uhd_swig_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig_guile.Std \
+			> $(DEPDIR)/uhd_swig_guile.Sd; \
+		$(RM) $(DEPDIR)/uhd_swig_guile.Std; \
+		$(MV) $(DEPDIR)/uhd_swig_guile.Sd $(DEPDIR)/uhd_swig_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/uhd_swig_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+	$(RM) $(DEPDIR)/uhd_swig_guile.d
+	cp $(DEPDIR)/uhd_swig_guile.Std $(DEPDIR)/uhd_swig_guile.d
+	echo "" >> $(DEPDIR)/uhd_swig_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig_guile.d
+	$(RM) $(DEPDIR)/uhd_swig_guile.Std
+	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+else
+	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/uhd_swig_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
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-uhd/swig/Makefile.swig.gen | 246 +++++-------------------------------------
 1 file changed, 28 insertions(+), 218 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index d10f6baa5..e06723814 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -41,12 +41,12 @@ uhd_swig_pylibdir = $(pyexecdir)/$(uhd_swig_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.
-uhd_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+uhd_swig_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/uhd_swig
 # FIXME: determince whether these should be installed with gnuradio.
-uhd_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+uhd_swig_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -82,9 +82,11 @@ 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 += uhd_swig.py uhd_swig_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 += uhd_swig.py
 if GUILE
-swig_built_sources += uhd_swig.scm uhd_swig_guile.cc
+swig_built_sources += uhd_swig.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,51 @@ uhd_swig_swiginclude_HEADERS =		\
 	$(uhd_swig_swiginclude_headers)
 
 uhd_swig_pylib_LTLIBRARIES =		\
-	_uhd_swig_python.la
+	_uhd_swig.la
 
-_uhd_swig_python_la_SOURCES = 		\
-	uhd_swig_python.cc		\
+_uhd_swig_la_SOURCES = 			\
+	python/uhd_swig.cc		\
 	$(uhd_swig_la_swig_sources)
 
-_uhd_swig_python_la_LIBADD =		\
+_uhd_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(uhd_swig_la_swig_libadd)
 
-_uhd_swig_python_la_LDFLAGS =		\
+# _uhd_swig_la_DEPENDENCIES = python/uhd_swig.lo
+
+_uhd_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(uhd_swig_la_swig_ldflags)
 
-_uhd_swig_python_la_CXXFLAGS =		\
+_uhd_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(uhd_swig_la_swig_cxxflags)
 
 uhd_swig_python_PYTHON =			\
 	uhd_swig.py			\
-	$(uhd_swig_python)
+	$(uhd_swig)
 
 if GUILE
-uhd_swig_scmlib_LTLIBRARIES = _uhd_swig_guile.la
-_uhd_swig_guile_la_SOURCES = 		\
-	uhd_swig_guile.cc		        \
+uhd_swig_scmlib_LTLIBRARIES = uhd_swig_guile.la
+uhd_swig_guile_la_SOURCES = 		\
+	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
 uhd_swig_scm_DATA = uhd_swig.scm
 
 # Guile can use the same flags as python does
-_uhd_swig_guile_la_LIBADD = $(_uhd_swig_python_la_LIBADD)
-_uhd_swig_guile_la_LDFLAGS = $(_uhd_swig_python_la_LDFLAGS)
-_uhd_swig_guile_la_CXXFLAGS = $(_uhd_swig_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+uhd_swig_guile_la_LIBADD = $(_uhd_swig_la_LIBADD)
+uhd_swig_guile_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
+uhd_swig_guile_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): uhd_swig.i
-uhd_swig_python.h uhd_swig.py uhd_swig_python.cc: uhd_swig.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)/uhd_swig-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)/uhd_swig-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)/uhd_swig-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)/uhd_swig-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-python-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)/uhd_swig-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)/uhd_swig-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)/uhd_swig-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/uhd_swig.lo: uhd_swig.lo
+uhd_swig.scm: uhd_swig.i
 
-# the comments for the target above apply to this target as well, but it seemed
-# silly to include them twice. The only main change is for guile.
-uhd_swig_guile.h uhd_swig.scm uhd_swig_guile.cc: uhd_swig.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/uhd_swig-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/uhd_swig-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/uhd_swig-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/uhd_swig-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/uhd_swig-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/uhd_swig-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/uhd_swig-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) $(uhd_swig_swig_args) \
-		-MD -MF $(DEPDIR)/uhd_swig_python.Std \
-		-module uhd_swig -o uhd_swig_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/uhd_swig_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig_python.Std \
-			> $(DEPDIR)/uhd_swig_python.Sd; \
-		$(RM) $(DEPDIR)/uhd_swig_python.Std; \
-		$(MV) $(DEPDIR)/uhd_swig_python.Sd $(DEPDIR)/uhd_swig_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/uhd_swig_python.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)/uhd_swig_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/uhd_swig_python.Std $(DEPDIR)/uhd_swig_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/uhd_swig_python.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)/uhd_swig_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/uhd_swig_python.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)/uhd_swig-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,
-# we have accurate dependencies for our swig stuff, which is good.
-
-@am__include@ @am__quote@./$(DEPDIR)/uhd_swig_python.d@am__quote@
-
-if GUILE
-$(DEPDIR)/uhd_swig-generate-guile-stamp:
-# the comments for the target above apply to this target as well, but it seemed
-# silly to include them twice. The only main change is for guile.
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(uhd_swig_swig_args) \
-		-MD -MF $(DEPDIR)/uhd_swig_guile.Std \
-		-module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/uhd_swig_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig_guile.Std \
-			> $(DEPDIR)/uhd_swig_guile.Sd; \
-		$(RM) $(DEPDIR)/uhd_swig_guile.Std; \
-		$(MV) $(DEPDIR)/uhd_swig_guile.Sd $(DEPDIR)/uhd_swig_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/uhd_swig_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
-	$(RM) $(DEPDIR)/uhd_swig_guile.d
-	cp $(DEPDIR)/uhd_swig_guile.Std $(DEPDIR)/uhd_swig_guile.d
-	echo "" >> $(DEPDIR)/uhd_swig_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig_guile.d
-	$(RM) $(DEPDIR)/uhd_swig_guile.Std
-	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
-else
-	touch $(DEPDIR)/uhd_swig-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/uhd_swig_guile.d@am__quote@
+python/uhd_swig.lo:
+uhd_swig.lo: uhd_swig.py uhd_swig.scm
+uhd_swig.py: uhd_swig.i
 
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+-include python/uhd_swig.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-uhd/swig/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index e06723814..88ed33834 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -41,7 +41,7 @@ uhd_swig_pylibdir = $(pyexecdir)/$(uhd_swig_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.
-uhd_swig_scmlibdir = $(libdir)/guile/gnuradio
+uhd_swig_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/uhd_swig
@@ -124,16 +124,16 @@ uhd_swig_python_PYTHON =			\
 	$(uhd_swig)
 
 if GUILE
-uhd_swig_scmlib_LTLIBRARIES = uhd_swig_guile.la
-uhd_swig_guile_la_SOURCES = 		\
+uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la
+libguile_uhd_swig_la_SOURCES = 		\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
 uhd_swig_scm_DATA = uhd_swig.scm
 
 # Guile can use the same flags as python does
-uhd_swig_guile_la_LIBADD = $(_uhd_swig_la_LIBADD)
-uhd_swig_guile_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
-uhd_swig_guile_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
+libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
+libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
+libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
 
 guile/uhd_swig.lo: uhd_swig.lo
 uhd_swig.scm: uhd_swig.i
-- 
cgit 


From 2c54f4a56304b3dba7a66ed1baf06dc0bd8393e8 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 10:12:43 -0700
Subject: additional regenerated files

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

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 88ed33834..86ead5b00 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ uhd_swig_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/uhd_swig
 # FIXME: determince whether these should be installed with gnuradio.
-uhd_swig_scmdir = $(guiledir)/gnuradio
+uhd_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la
 libguile_uhd_swig_la_SOURCES = 		\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
-uhd_swig_scm_DATA = uhd_swig.scm
+nobase_uhd_swig_scm_DATA = gnuradio/uhd_swig.scm gnuradio/uhd_swig-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
 
 guile/uhd_swig.lo: uhd_swig.lo
 uhd_swig.scm: uhd_swig.i
+gnuradio/uhd_swig-primitive.scm: uhd_swig.scm
+
+-include guile/uhd_swig.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-uhd/swig/Makefile.swig.gen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 86ead5b00..c0823e5f2 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/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 += uhd_swig.py
-if GUILE
-swig_built_sources += uhd_swig.scm
-endif
+# swig_built_sources += uhd_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/uhd_swig.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_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
 libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
 libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
 
-guile/uhd_swig.lo: uhd_swig.lo
-uhd_swig.scm: uhd_swig.i
-gnuradio/uhd_swig-primitive.scm: uhd_swig.scm
+guile/uhd_swig.cc: gnuradio/uhd_swig.scm
+gnuradio/uhd_swig.scm: uhd_swig.i
+gnuradio/uhd_swig-primitive.scm: gnuradio/uhd_swig.scm
 
 -include guile/uhd_swig.d
 
 endif				# end of GUILE
 
-python/uhd_swig.lo:
 uhd_swig.lo: uhd_swig.py uhd_swig.scm
 uhd_swig.py: uhd_swig.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-uhd/swig/Makefile.swig.gen | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index c0823e5f2..1ddbf0bd9 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -67,28 +67,10 @@ uhd_swig_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)/uhd_swig-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 += uhd_swig.py
-# if GUILE
-# swig_built_sources += gnuradio/uhd_swig.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 @@ _uhd_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(uhd_swig_la_swig_libadd)
 
-# _uhd_swig_la_DEPENDENCIES = python/uhd_swig.lo
-
 _uhd_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(uhd_swig_la_swig_ldflags)
@@ -123,14 +103,20 @@ uhd_swig_python_PYTHON =			\
 	uhd_swig.py			\
 	$(uhd_swig)
 
+python/uhd_swig.cc: uhd_swig.py
+uhd_swig.py: uhd_swig.i
+
+# Include the python dependencies for this file
+-include python/uhd_swig.d
+# end of PYTHON
+
 if GUILE
 uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la
-libguile_uhd_swig_la_SOURCES = 		\
+libguile_uhd_swig_la_SOURCES =		\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
 nobase_uhd_swig_scm_DATA = gnuradio/uhd_swig.scm gnuradio/uhd_swig-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
 libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
 libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/uhd_swig.cc: gnuradio/uhd_swig.scm
 gnuradio/uhd_swig.scm: uhd_swig.i
 gnuradio/uhd_swig-primitive.scm: gnuradio/uhd_swig.scm
 
+# Include the guile dependencies for this file
 -include guile/uhd_swig.d
 
 endif				# end of GUILE
 
-uhd_swig.lo: uhd_swig.py uhd_swig.scm
-uhd_swig.py: uhd_swig.i
-
--include python/uhd_swig.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-uhd/swig/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 1ddbf0bd9..cf7351fe2 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -101,7 +101,7 @@ _uhd_swig_la_CXXFLAGS =			\
 
 uhd_swig_python_PYTHON =			\
 	uhd_swig.py			\
-	$(uhd_swig)
+	$(uhd_swig_python)
 
 python/uhd_swig.cc: uhd_swig.py
 uhd_swig.py: uhd_swig.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-uhd/swig/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index cf7351fe2..782800c9b 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -79,6 +79,7 @@ uhd_swig_swiginclude_HEADERS =		\
 	uhd_swig.i			\
 	$(uhd_swig_swiginclude_headers)
 
+if PYTHON
 uhd_swig_pylib_LTLIBRARIES =		\
 	_uhd_swig.la
 
@@ -86,6 +87,10 @@ _uhd_swig_la_SOURCES = 			\
 	python/uhd_swig.cc		\
 	$(uhd_swig_la_swig_sources)
 
+uhd_swig_python_PYTHON =			\
+	uhd_swig.py			\
+	$(uhd_swig_python)
+
 _uhd_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(uhd_swig_la_swig_libadd)
@@ -99,27 +104,34 @@ _uhd_swig_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(uhd_swig_la_swig_cxxflags)
 
-uhd_swig_python_PYTHON =			\
-	uhd_swig.py			\
-	$(uhd_swig_python)
-
 python/uhd_swig.cc: uhd_swig.py
 uhd_swig.py: uhd_swig.i
 
 # Include the python dependencies for this file
 -include python/uhd_swig.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la
+
+uhd_swig_scmlib_LTLIBRARIES = 		\
+	libguile-uhd_swig.la
 libguile_uhd_swig_la_SOURCES =		\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
-nobase_uhd_swig_scm_DATA = gnuradio/uhd_swig.scm gnuradio/uhd_swig-primitive.scm
-
-libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
-libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS)
-libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
+nobase_uhd_swig_scm_DATA = 		\
+	gnuradio/uhd_swig.scm 		\
+	gnuradio/uhd_swig-primitive.scm
+libguile_uhd_swig_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(uhd_swig_la_swig_libadd)
+libguile_uhd_swig_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(uhd_swig_la_swig_ldflags)
+libguile_uhd_swig_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(uhd_swig_la_swig_cxxflags)
 
 guile/uhd_swig.cc: gnuradio/uhd_swig.scm
 gnuradio/uhd_swig.scm: uhd_swig.i
-- 
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-uhd/swig/Makefile.swig.gen | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gr-uhd/swig/Makefile.swig.gen')

diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 782800c9b..b73ccd3c4 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 uhd_swig_scmlib_LTLIBRARIES = 		\
-	libguile-uhd_swig.la
-libguile_uhd_swig_la_SOURCES =		\
+	libguile-gnuradio-uhd_swig.la
+libguile_gnuradio_uhd_swig_la_SOURCES =	\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
 nobase_uhd_swig_scm_DATA = 		\
 	gnuradio/uhd_swig.scm 		\
 	gnuradio/uhd_swig-primitive.scm
-libguile_uhd_swig_la_LIBADD = 		\
+libguile_gnuradio_uhd_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(uhd_swig_la_swig_libadd)
-libguile_uhd_swig_la_LDFLAGS = 		\
+libguile_gnuradio_uhd_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(uhd_swig_la_swig_ldflags)
-libguile_uhd_swig_la_CXXFLAGS = 		\
+libguile_gnuradio_uhd_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(uhd_swig_la_swig_cxxflags)
-- 
cgit