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

---
 usrp/host/swig/Makefile.swig.gen | 59 ++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 00de3e423..df9ec8b03 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/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 += usrp_prims.py usrp_prims.cc
+swig_built_sources += usrp_prims.py usrp_prims_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 @@ usrp_prims_swiginclude_HEADERS =		\
 	$(usrp_prims_swiginclude_headers)
 
 usrp_prims_pylib_LTLIBRARIES =		\
-	_usrp_prims.la
+	_usrp_prims_python.la
 
-_usrp_prims_la_SOURCES = 			\
-	usrp_prims.cc			\
+_usrp_prims_python_la_SOURCES = 		\
+	usrp_prims_python.cc		\
 	$(usrp_prims_la_swig_sources)
 
-_usrp_prims_la_LIBADD =			\
+_usrp_prims_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
 
-_usrp_prims_la_LDFLAGS =			\
+_usrp_prims_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
 
-_usrp_prims_la_CXXFLAGS =			\
+_usrp_prims_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(usrp_prims_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ usrp_prims_python_PYTHON =			\
 	usrp_prims.py			\
 	$(usrp_prims_python)
 
+if GUILE
+usrp_prims_pylib_LTLIBRARIES += _usrp_prims_guile.la
+
+_usrp_prims_guile_la_SOURCES = 		\
+	usrp_prims_guile.cc		\
+	$(usrp_prims_la_swig_sources)
+
+# Guile can use the same flags as python does
+_usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD)
+_usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_python_la_LDFLAGS)
+_usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
+usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.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 @@ usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/usrp_prims-generate-stamp; \
+		rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-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 @@ usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/usrp_prims-generate-stamp; \
+		test -f $(DEPDIR)/usrp_prims-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/usrp_prims-generate-stamp:
+$(DEPDIR)/usrp_prims-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_prims_swig_args) \
+		-MD -MF $(DEPDIR)/usrp_prims.Std \
+		-module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/usrp_prims.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
+			> $(DEPDIR)/usrp_prims.Sd; \
+		$(RM) $(DEPDIR)/usrp_prims.Std; \
+		$(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
+
+$(DEPDIR)/usrp_prims-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)/usrp_prims-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_prims_swig_args) \
 		-MD -MF $(DEPDIR)/usrp_prims.Std \
-		-module usrp_prims -o usrp_prims.cc $(WHAT); then \
+		-module usrp_prims -o usrp_prims_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/usrp_prims.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
@@ -249,7 +280,7 @@ $(DEPDIR)/usrp_prims-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/usrp_prims-generate-stamp
+	touch $(DEPDIR)/usrp_prims-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

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

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index df9ec8b03..ec804159b 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ usrp_prims_pylibdir_category ?= $(usrp_prims_pythondir_category)
 usrp_prims_pythondir = $(pythondir)/$(usrp_prims_pythondir_category)
 usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_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.
+usrp_prims_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/usrp_prims
+# FIXME: determince whether these should be installed with gnuradio.
+usrp_prims_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 usrp_prims_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += usrp_prims.py usrp_prims_python.cc
+if GUILE
+swig_built_sources += usrp_prims.scm usrp_prims_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 @@ usrp_prims_python_PYTHON =			\
 	$(usrp_prims_python)
 
 if GUILE
-usrp_prims_pylib_LTLIBRARIES += _usrp_prims_guile.la
-
+usrp_prims_scmlib_LTLIBRARIES = _usrp_prims_guile.la
 _usrp_prims_guile_la_SOURCES = 		\
-	usrp_prims_guile.cc		\
+	usrp_prims_guile.cc		        \
 	$(usrp_prims_la_swig_sources)
+usrp_prims_scm_DATA = usrp_prims.scm
 
 # Guile can use the same flags as python does
 _usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i
+# $(python_deps) $(guile_deps): usrp_prims.i
+usrp_prims_python.h usrp_prims.py usrp_prims_python.cc: usrp_prims.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 @@ usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-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 @@ usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/usrp_prims-generate-guile-stamp:
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims.Std \
-		-module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
-			> $(DEPDIR)/usrp_prims.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims.Std; \
-		$(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.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.
+usrp_prims_guile.h usrp_prims.scm usrp_prims_guile.cc: usrp_prims.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/usrp_prims-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/usrp_prims-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/usrp_prims-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \
+		while test -d $(DEPDIR)/usrp_prims-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/usrp_prims-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
+endif				# end of GUILE
 
 $(DEPDIR)/usrp_prims-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -232,17 +247,17 @@ $(DEPDIR)/usrp_prims-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims.Std \
+		-MD -MF $(DEPDIR)/usrp_prims_python.Std \
 		-module usrp_prims -o usrp_prims_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
-			> $(DEPDIR)/usrp_prims.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims.Std; \
-		$(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.Std; \
+		$(RM) $(DEPDIR)/usrp_prims_python.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_python.Std \
+			> $(DEPDIR)/usrp_prims_python.Sd; \
+		$(RM) $(DEPDIR)/usrp_prims_python.Std; \
+		$(MV) $(DEPDIR)/usrp_prims_python.Sd $(DEPDIR)/usrp_prims_python.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \
+	    $(RM) $(DEPDIR)/usrp_prims_python.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -254,27 +269,27 @@ $(DEPDIR)/usrp_prims-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/usrp_prims.d
+	$(RM) $(DEPDIR)/usrp_prims_python.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/usrp_prims.Std $(DEPDIR)/usrp_prims.d
+	cp $(DEPDIR)/usrp_prims_python.Std $(DEPDIR)/usrp_prims_python.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/usrp_prims.d
+	echo "" >> $(DEPDIR)/usrp_prims_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)/usrp_prims.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims_python.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_python.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/usrp_prims.Std
+	$(RM) $(DEPDIR)/usrp_prims_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)/usrp_prims-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)/usrp_prims.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_python.d@am__quote@
+
+if GUILE
+$(DEPDIR)/usrp_prims-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) $(usrp_prims_swig_args) \
+		-MD -MF $(DEPDIR)/usrp_prims_guile.Std \
+		-module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/usrp_prims_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_guile.Std \
+			> $(DEPDIR)/usrp_prims_guile.Sd; \
+		$(RM) $(DEPDIR)/usrp_prims_guile.Std; \
+		$(MV) $(DEPDIR)/usrp_prims_guile.Sd $(DEPDIR)/usrp_prims_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/usrp_prims_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
+	$(RM) $(DEPDIR)/usrp_prims_guile.d
+	cp $(DEPDIR)/usrp_prims_guile.Std $(DEPDIR)/usrp_prims_guile.d
+	echo "" >> $(DEPDIR)/usrp_prims_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_guile.d
+	$(RM) $(DEPDIR)/usrp_prims_guile.Std
+	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
+else
+	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
cgit 


From 9a55e397415e9a9b144812953c8b9760232105b4 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 18 Oct 2010 20:40:54 -0700
Subject: gitignore swig generated files

---
 usrp/host/swig/.gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/.gitignore b/usrp/host/swig/.gitignore
index 3a0816517..64c2226bc 100644
--- a/usrp/host/swig/.gitignore
+++ b/usrp/host/swig/.gitignore
@@ -6,9 +6,10 @@
 /.libs
 /*.la
 /*.lo
-/gnuradio_swig_python.cc
-/gnuradio_swig_python.py
 /usrp_prims.cc
 /usrp_prims.py
+/usrp_prims.scm
+/usrp_prims_python.cc
+/usrp_prims_guile.cc
 /prims.cc
 /prims.py
-- 
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

---
 usrp/host/swig/Makefile.swig.gen | 246 +++++----------------------------------
 1 file changed, 28 insertions(+), 218 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index ec804159b..830552a2c 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -41,12 +41,12 @@ usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_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.
-usrp_prims_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+usrp_prims_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_prims
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_prims_scmdir = @GUILE_PKDATADIR@/gnuradio
+usrp_prims_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 += usrp_prims.py usrp_prims_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 += usrp_prims.py
 if GUILE
-swig_built_sources += usrp_prims.scm usrp_prims_guile.cc
+swig_built_sources += usrp_prims.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,51 @@ usrp_prims_swiginclude_HEADERS =		\
 	$(usrp_prims_swiginclude_headers)
 
 usrp_prims_pylib_LTLIBRARIES =		\
-	_usrp_prims_python.la
+	_usrp_prims.la
 
-_usrp_prims_python_la_SOURCES = 		\
-	usrp_prims_python.cc		\
+_usrp_prims_la_SOURCES = 			\
+	python/usrp_prims.cc		\
 	$(usrp_prims_la_swig_sources)
 
-_usrp_prims_python_la_LIBADD =		\
+_usrp_prims_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
 
-_usrp_prims_python_la_LDFLAGS =		\
+# _usrp_prims_la_DEPENDENCIES = python/usrp_prims.lo
+
+_usrp_prims_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
 
-_usrp_prims_python_la_CXXFLAGS =		\
+_usrp_prims_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(usrp_prims_la_swig_cxxflags)
 
 usrp_prims_python_PYTHON =			\
 	usrp_prims.py			\
-	$(usrp_prims_python)
+	$(usrp_prims)
 
 if GUILE
-usrp_prims_scmlib_LTLIBRARIES = _usrp_prims_guile.la
-_usrp_prims_guile_la_SOURCES = 		\
-	usrp_prims_guile.cc		        \
+usrp_prims_scmlib_LTLIBRARIES = usrp_prims_guile.la
+usrp_prims_guile_la_SOURCES = 		\
+	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
 usrp_prims_scm_DATA = usrp_prims.scm
 
 # Guile can use the same flags as python does
-_usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD)
-_usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_python_la_LDFLAGS)
-_usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+usrp_prims_guile_la_LIBADD = $(_usrp_prims_la_LIBADD)
+usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
+usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): usrp_prims.i
-usrp_prims_python.h usrp_prims.py usrp_prims_python.cc: usrp_prims.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)/usrp_prims-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)/usrp_prims-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)/usrp_prims-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)/usrp_prims-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-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)/usrp_prims-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)/usrp_prims-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)/usrp_prims-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/usrp_prims.lo: usrp_prims.lo
+usrp_prims.scm: usrp_prims.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.
-usrp_prims_guile.h usrp_prims.scm usrp_prims_guile.cc: usrp_prims.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/usrp_prims-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/usrp_prims-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/usrp_prims-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/usrp_prims-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/usrp_prims-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/usrp_prims-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) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims_python.Std \
-		-module usrp_prims -o usrp_prims_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_python.Std \
-			> $(DEPDIR)/usrp_prims_python.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims_python.Std; \
-		$(MV) $(DEPDIR)/usrp_prims_python.Sd $(DEPDIR)/usrp_prims_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_prims_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)/usrp_prims_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/usrp_prims_python.Std $(DEPDIR)/usrp_prims_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/usrp_prims_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)/usrp_prims_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/usrp_prims_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)/usrp_prims-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)/usrp_prims_python.d@am__quote@
-
-if GUILE
-$(DEPDIR)/usrp_prims-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) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims_guile.Std \
-		-module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_guile.Std \
-			> $(DEPDIR)/usrp_prims_guile.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims_guile.Std; \
-		$(MV) $(DEPDIR)/usrp_prims_guile.Sd $(DEPDIR)/usrp_prims_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_prims_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
-	$(RM) $(DEPDIR)/usrp_prims_guile.d
-	cp $(DEPDIR)/usrp_prims_guile.Std $(DEPDIR)/usrp_prims_guile.d
-	echo "" >> $(DEPDIR)/usrp_prims_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_guile.d
-	$(RM) $(DEPDIR)/usrp_prims_guile.Std
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
-else
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_guile.d@am__quote@
+python/usrp_prims.lo:
+usrp_prims.lo: usrp_prims.py usrp_prims.scm
+usrp_prims.py: usrp_prims.i
 
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+-include python/usrp_prims.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

---
 usrp/host/swig/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 830552a2c..32fbfa35e 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -41,7 +41,7 @@ usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_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.
-usrp_prims_scmlibdir = $(libdir)/guile/gnuradio
+usrp_prims_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_prims
@@ -124,16 +124,16 @@ usrp_prims_python_PYTHON =			\
 	$(usrp_prims)
 
 if GUILE
-usrp_prims_scmlib_LTLIBRARIES = usrp_prims_guile.la
-usrp_prims_guile_la_SOURCES = 		\
+usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la
+libguile_usrp_prims_la_SOURCES = 		\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
 usrp_prims_scm_DATA = usrp_prims.scm
 
 # Guile can use the same flags as python does
-usrp_prims_guile_la_LIBADD = $(_usrp_prims_la_LIBADD)
-usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
-usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
+libguile_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
+libguile_usrp_prims_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
+libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
 guile/usrp_prims.lo: usrp_prims.lo
 usrp_prims.scm: usrp_prims.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

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

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 32fbfa35e..16e23dccd 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ usrp_prims_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_prims
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_prims_scmdir = $(guiledir)/gnuradio
+usrp_prims_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la
 libguile_usrp_prims_la_SOURCES = 		\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
-usrp_prims_scm_DATA = usrp_prims.scm
+nobase_usrp_prims_scm_DATA = gnuradio/usrp_prims.scm gnuradio/usrp_prims-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
 guile/usrp_prims.lo: usrp_prims.lo
 usrp_prims.scm: usrp_prims.i
+gnuradio/usrp_prims-primitive.scm: usrp_prims.scm
+
+-include guile/usrp_prims.d
 
 endif				# end of GUILE
 
-- 
cgit 


From 2b11c904da6799b6a7240d64d2ba37ddcaf1e479 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 1 Nov 2010 16:06:37 -0600
Subject: regenerated

---
 usrp/host/swig/Makefile.swig.gen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 16e23dccd..7b778a11b 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/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 += usrp_prims.py
-if GUILE
-swig_built_sources += usrp_prims.scm
-endif
+# swig_built_sources += usrp_prims.py
+# if GUILE
+# swig_built_sources += gnuradio/usrp_prims.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_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
 libguile_usrp_prims_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
 libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
-guile/usrp_prims.lo: usrp_prims.lo
-usrp_prims.scm: usrp_prims.i
-gnuradio/usrp_prims-primitive.scm: usrp_prims.scm
+guile/usrp_prims.cc: gnuradio/usrp_prims.scm
+gnuradio/usrp_prims.scm: usrp_prims.i
+gnuradio/usrp_prims-primitive.scm: gnuradio/usrp_prims.scm
 
 -include guile/usrp_prims.d
 
 endif				# end of GUILE
 
-python/usrp_prims.lo:
 usrp_prims.lo: usrp_prims.py usrp_prims.scm
 usrp_prims.py: usrp_prims.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

---
 usrp/host/swig/Makefile.swig.gen | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 7b778a11b..3af94a3c2 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -67,28 +67,10 @@ usrp_prims_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)/usrp_prims-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 += usrp_prims.py
-# if GUILE
-# swig_built_sources += gnuradio/usrp_prims.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 @@ _usrp_prims_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
 
-# _usrp_prims_la_DEPENDENCIES = python/usrp_prims.lo
-
 _usrp_prims_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
@@ -123,14 +103,20 @@ usrp_prims_python_PYTHON =			\
 	usrp_prims.py			\
 	$(usrp_prims)
 
+python/usrp_prims.cc: usrp_prims.py
+usrp_prims.py: usrp_prims.i
+
+# Include the python dependencies for this file
+-include python/usrp_prims.d
+# end of PYTHON
+
 if GUILE
 usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la
-libguile_usrp_prims_la_SOURCES = 		\
+libguile_usrp_prims_la_SOURCES =		\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
 nobase_usrp_prims_scm_DATA = gnuradio/usrp_prims.scm gnuradio/usrp_prims-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
 libguile_usrp_prims_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
 libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/usrp_prims.cc: gnuradio/usrp_prims.scm
 gnuradio/usrp_prims.scm: usrp_prims.i
 gnuradio/usrp_prims-primitive.scm: gnuradio/usrp_prims.scm
 
+# Include the guile dependencies for this file
 -include guile/usrp_prims.d
 
 endif				# end of GUILE
 
-usrp_prims.lo: usrp_prims.py usrp_prims.scm
-usrp_prims.py: usrp_prims.i
-
--include python/usrp_prims.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

---
 usrp/host/swig/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 3af94a3c2..90bd2e53d 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -101,7 +101,7 @@ _usrp_prims_la_CXXFLAGS =			\
 
 usrp_prims_python_PYTHON =			\
 	usrp_prims.py			\
-	$(usrp_prims)
+	$(usrp_prims_python)
 
 python/usrp_prims.cc: usrp_prims.py
 usrp_prims.py: usrp_prims.i
-- 
cgit 


From 8c81cf7d318d99f508e81bffcfd4c12ba0a2966e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 16 Nov 2010 21:40:55 -0800
Subject: Fix guile related problem with gr-usrp

---
 usrp/host/include/usrp/db_base.i | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usrp/host')

diff --git a/usrp/host/include/usrp/db_base.i b/usrp/host/include/usrp/db_base.i
index 78c72b8c3..fdabd4f99 100644
--- a/usrp/host/include/usrp/db_base.i
+++ b/usrp/host/include/usrp/db_base.i
@@ -91,6 +91,7 @@ typedef boost::shared_ptr<db_base> db_base_sptr;
 %template(db_base_sptr_vector) std::vector<db_base_sptr>;
 %template(db_base_sptr_vector_vector) std::vector<std::vector<db_base_sptr> >;
 
+#ifdef SWIGPYTHON
 // Set better class name in Python
 // Enable freq_range and gain_range from public methods of class not implemented in C++
 // And create a dummy wrapper for backwards compatability with some of the example code
@@ -98,5 +99,5 @@ typedef boost::shared_ptr<db_base> db_base_sptr;
   db_base_sptr.__repr__ = lambda self: "<db_base::%s>" % (self.name(),)
   db_base_sptr.freq_range = lambda self: (self.freq_min(), self.freq_max(), 1)
   db_base_sptr.gain_range = lambda self: (self.gain_min(), self.gain_max(), self.gain_db_per_step())
-
 %}
+#endif
-- 
cgit 


From 75f3bce02ed8ec7e7be27dc6a397be92cb663ce6 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 17 Nov 2010 18:52:05 -0800
Subject: Keep doxygen 1.7.1 from crashing.

---
 usrp/host/include/usrp/usrp_basic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usrp/host')

diff --git a/usrp/host/include/usrp/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h
index c24630eb6..b76493ea4 100644
--- a/usrp/host/include/usrp/usrp_basic.h
+++ b/usrp/host/include/usrp/usrp_basic.h
@@ -88,7 +88,7 @@ protected:
    */
   std::vector< std::vector<db_base_sptr> > d_db;
 
-  //! One time call, made only only from usrp_standard_*::make after shared_ptr is created.
+  // One time call, made only only from usrp_standard_*::make after shared_ptr is created.
   void init_db(usrp_basic_sptr u);
 
 
-- 
cgit 


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

---
 usrp/host/swig/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 90bd2e53d..7c910eb67 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -79,6 +79,7 @@ usrp_prims_swiginclude_HEADERS =		\
 	usrp_prims.i			\
 	$(usrp_prims_swiginclude_headers)
 
+if PYTHON
 usrp_prims_pylib_LTLIBRARIES =		\
 	_usrp_prims.la
 
@@ -86,6 +87,10 @@ _usrp_prims_la_SOURCES = 			\
 	python/usrp_prims.cc		\
 	$(usrp_prims_la_swig_sources)
 
+usrp_prims_python_PYTHON =			\
+	usrp_prims.py			\
+	$(usrp_prims_python)
+
 _usrp_prims_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
@@ -99,27 +104,34 @@ _usrp_prims_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(usrp_prims_la_swig_cxxflags)
 
-usrp_prims_python_PYTHON =			\
-	usrp_prims.py			\
-	$(usrp_prims_python)
-
 python/usrp_prims.cc: usrp_prims.py
 usrp_prims.py: usrp_prims.i
 
 # Include the python dependencies for this file
 -include python/usrp_prims.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la
+
+usrp_prims_scmlib_LTLIBRARIES = 		\
+	libguile-usrp_prims.la
 libguile_usrp_prims_la_SOURCES =		\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
-nobase_usrp_prims_scm_DATA = gnuradio/usrp_prims.scm gnuradio/usrp_prims-primitive.scm
-
-libguile_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
-libguile_usrp_prims_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
-libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
+nobase_usrp_prims_scm_DATA = 		\
+	gnuradio/usrp_prims.scm 		\
+	gnuradio/usrp_prims-primitive.scm
+libguile_usrp_prims_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(usrp_prims_la_swig_libadd)
+libguile_usrp_prims_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(usrp_prims_la_swig_ldflags)
+libguile_usrp_prims_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(usrp_prims_la_swig_cxxflags)
 
 guile/usrp_prims.cc: gnuradio/usrp_prims.scm
 gnuradio/usrp_prims.scm: usrp_prims.i
-- 
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.
---
 usrp/host/include/usrp/Makefile.am | 6 ++----
 usrp/host/lib/Makefile.am          | 4 ++--
 usrp/host/misc/Makefile.am         | 4 ++--
 usrp/host/swig/Makefile.am         | 9 +--------
 4 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am
index 2aaf66a53..19504313b 100644
--- a/usrp/host/include/usrp/Makefile.am
+++ b/usrp/host/include/usrp/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -47,10 +47,8 @@ usrpinclude_HEADERS = \
 	usrp_subdev_spec.h \
 	usrp_tune_result.h
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	libusb_types.h.in
 
-if PYTHON
 swiginclude_HEADERS = \
 	db_base.i
-endif
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index b8b60fa98..96ab55821 100644
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -42,11 +42,11 @@ libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
 libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
 endif
 
-EXTRA_DIST = 				\
+EXTRA_DIST += 				\
 	std_paths.h.in			\
 	usrp_dbid.dat
 
-BUILT_SOURCES = $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
+BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
 
 BUILT_SOURCES += usrp_dbid.cc \
 		 usrp_dbid.py
diff --git a/usrp/host/misc/Makefile.am b/usrp/host/misc/Makefile.am
index 45c940f67..935dc74b5 100644
--- a/usrp/host/misc/Makefile.am
+++ b/usrp/host/misc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2004 Free Software Foundation, Inc.
+# Copyright 2003,2004,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	getopt.c getopt.h \
 	gettimeofday.c \
 	tempname.c mkstemp.c \
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index c846f267b..5baeff4cb 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -20,6 +20,7 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 AM_CPPFLAGS =			\
 	$(USRP_INCLUDES)	\
@@ -53,11 +54,3 @@ usrp_prims_la_swig_libadd =	\
 usrp_prims_python =		\
 	__init__.py		\
 	usrp_fpga_regs.py
-
-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)
-- 
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

---
 usrp/host/swig/.gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/.gitignore b/usrp/host/swig/.gitignore
index 64c2226bc..9897dac41 100644
--- a/usrp/host/swig/.gitignore
+++ b/usrp/host/swig/.gitignore
@@ -9,7 +9,8 @@
 /usrp_prims.cc
 /usrp_prims.py
 /usrp_prims.scm
-/usrp_prims_python.cc
-/usrp_prims_guile.cc
 /prims.cc
 /prims.py
+/gnuradio
+/guile
+/python
-- 
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

---
 usrp/host/swig/Makefile.swig.gen | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'usrp/host')

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 7c910eb67..b4cc97caa 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 usrp_prims_scmlib_LTLIBRARIES = 		\
-	libguile-usrp_prims.la
-libguile_usrp_prims_la_SOURCES =		\
+	libguile-gnuradio-usrp_prims.la
+libguile_gnuradio_usrp_prims_la_SOURCES =	\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
 nobase_usrp_prims_scm_DATA = 		\
 	gnuradio/usrp_prims.scm 		\
 	gnuradio/usrp_prims-primitive.scm
-libguile_usrp_prims_la_LIBADD = 		\
+libguile_gnuradio_usrp_prims_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
-libguile_usrp_prims_la_LDFLAGS = 		\
+libguile_gnuradio_usrp_prims_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
-libguile_usrp_prims_la_CXXFLAGS = 		\
+libguile_gnuradio_usrp_prims_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(usrp_prims_la_swig_cxxflags)
-- 
cgit