From b47b9ca40ecf49afa44c993b8da9af4ff876c9ba Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Wed, 13 Oct 2010 22:25:16 -0600
Subject: regenerated from template

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index f40f0d881..e0b2bfd53 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/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 += qtgui.py qtgui.cc
+swig_built_sources += qtgui.py qtgui-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ qtgui_pylib_LTLIBRARIES =		\
 	_qtgui.la
 
 _qtgui_la_SOURCES = 			\
-	qtgui.cc			\
+	qtgui-python.cc			\
 	$(qtgui_la_swig_sources)
 
 _qtgui_la_LIBADD =			\
@@ -107,7 +107,7 @@ qtgui_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-qtgui.h qtgui.py qtgui.cc: qtgui.i
+qtgui.h qtgui.py qtgui-python.cc: qtgui.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 +159,12 @@ qtgui.h qtgui.py qtgui.cc: qtgui.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/qtgui-generate-stamp; \
+		rm -f $(DEPDIR)/qtgui-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-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 +188,27 @@ qtgui.h qtgui.py qtgui.cc: qtgui.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/qtgui-generate-stamp; \
+		test -f $(DEPDIR)/qtgui-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/qtgui-generate-stamp:
+$(DEPDIR)/qtgui-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
+		-MD -MF $(DEPDIR)/qtgui.Std \
+		-module qtgui -o qtgui-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/qtgui.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
+			> $(DEPDIR)/qtgui.Sd; \
+		$(RM) $(DEPDIR)/qtgui.Std; \
+		$(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+
+$(DEPDIR)/qtgui-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 +219,7 @@ $(DEPDIR)/qtgui-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui.cc $(WHAT); then \
+		-module qtgui -o qtgui-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/qtgui.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/qtgui-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/qtgui-generate-stamp
+	touch $(DEPDIR)/qtgui-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 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-qtgui/src/lib/Makefile.swig.gen | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index e0b2bfd53..ab23f1618 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/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 += qtgui.py qtgui-python.cc
+swig_built_sources += qtgui.py qtgui_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 @@ qtgui_swiginclude_HEADERS =		\
 	$(qtgui_swiginclude_headers)
 
 qtgui_pylib_LTLIBRARIES =		\
-	_qtgui.la
+	_qtgui_python.la
 
-_qtgui_la_SOURCES = 			\
-	qtgui-python.cc			\
+_qtgui_python_la_SOURCES = 		\
+	qtgui_python.cc		\
 	$(qtgui_la_swig_sources)
 
-_qtgui_la_LIBADD =			\
+_qtgui_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
 
-_qtgui_la_LDFLAGS =			\
+_qtgui_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
 
-_qtgui_la_CXXFLAGS =			\
+_qtgui_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(qtgui_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ qtgui_python_PYTHON =			\
 	qtgui.py			\
 	$(qtgui_python)
 
+if GUILE
+qtgui_pylib_LTLIBRARIES += _qtgui_guile.la
+
+_qtgui_guile_la_SOURCES = 		\
+	qtgui_guile.cc		\
+	$(qtgui_la_swig_sources)
+
+# Guile can use the same flags as python does
+_qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD)
+_qtgui_guile_la_LDFLAGS = $(_qtgui_python_la_LDFLAGS)
+_qtgui_guile_la_CXXFLAGS = $(_qtgui_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-qtgui.h qtgui.py qtgui-python.cc: qtgui.i
+qtgui.h qtgui.py qtgui_python.cc: qtgui.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -193,9 +207,10 @@ qtgui.h qtgui.py qtgui-python.cc: qtgui.i
 	fi;
 
 $(DEPDIR)/qtgui-generate-guile-stamp:
+if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui-guile.cc $(WHAT); then \
+		-module qtgui -o qtgui_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/qtgui.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
@@ -207,6 +222,7 @@ $(DEPDIR)/qtgui-generate-guile-stamp:
 	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/qtgui-generate-guile-stamp
+endif
 
 $(DEPDIR)/qtgui-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -219,7 +235,7 @@ $(DEPDIR)/qtgui-generate-python-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui-python.cc $(WHAT); then \
+		-module qtgui -o qtgui_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/qtgui.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
-- 
cgit 


From b866f36454af0defea79d84647a8a1652fb2fbdb Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 16 Oct 2010 09:46:48 -0600
Subject: regenerated after changes to .i files

---
 gr-qtgui/src/lib/Makefile.swig.gen | 53 ++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 22 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index ab23f1618..a51e8eb87 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -121,7 +121,7 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-qtgui.h qtgui.py qtgui_python.cc: qtgui.i
+qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -209,19 +209,28 @@ qtgui.h qtgui.py qtgui_python.cc: qtgui.i
 $(DEPDIR)/qtgui-generate-guile-stamp:
 if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
-		-MD -MF $(DEPDIR)/qtgui.Std \
+		-MD -MF $(DEPDIR)/qtgui_guile.Std \
 		-module qtgui -o qtgui_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/qtgui.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
-			> $(DEPDIR)/qtgui.Sd; \
-		$(RM) $(DEPDIR)/qtgui.Std; \
-		$(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \
+		$(RM) $(DEPDIR)/qtgui_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \
+			> $(DEPDIR)/qtgui_guile.Sd; \
+		$(RM) $(DEPDIR)/qtgui_guile.Std; \
+		$(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
+	    $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/qtgui-generate-guile-stamp
+	$(RM) $(DEPDIR)/qtgui_guile.d
+	cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d
+	echo "" >> $(DEPDIR)/qtgui_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d
+	$(RM) $(DEPDIR)/qtgui_guile.Std
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@
 endif
 
 $(DEPDIR)/qtgui-generate-python-stamp:
@@ -234,17 +243,17 @@ $(DEPDIR)/qtgui-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \
-		-MD -MF $(DEPDIR)/qtgui.Std \
+		-MD -MF $(DEPDIR)/qtgui_python.Std \
 		-module qtgui -o qtgui_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/qtgui.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
-			> $(DEPDIR)/qtgui.Sd; \
-		$(RM) $(DEPDIR)/qtgui.Std; \
-		$(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \
+		$(RM) $(DEPDIR)/qtgui_python.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_python.Std \
+			> $(DEPDIR)/qtgui_python.Sd; \
+		$(RM) $(DEPDIR)/qtgui_python.Std; \
+		$(MV) $(DEPDIR)/qtgui_python.Sd $(DEPDIR)/qtgui_python.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
+	    $(RM) $(DEPDIR)/qtgui_python.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -256,27 +265,27 @@ $(DEPDIR)/qtgui-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/qtgui.d
+	$(RM) $(DEPDIR)/qtgui_python.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/qtgui.Std $(DEPDIR)/qtgui.d
+	cp $(DEPDIR)/qtgui_python.Std $(DEPDIR)/qtgui_python.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/qtgui.d
+	echo "" >> $(DEPDIR)/qtgui_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)/qtgui.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_python.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_python.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/qtgui.Std
+	$(RM) $(DEPDIR)/qtgui_python.Std
 ##
 ## Create the stamp for this filename generation, to signal success in
 ## executing this rule; allows other threads waiting on this process
@@ -288,5 +297,5 @@ $(DEPDIR)/qtgui-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)/qtgui.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/qtgui_python.d@am__quote@
 
-- 
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-qtgui/src/lib/Makefile.swig.gen | 93 ++++++++++++++++++++++++++------------
 1 file changed, 65 insertions(+), 28 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index a51e8eb87..8759ce00d 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ qtgui_pylibdir_category ?= $(qtgui_pythondir_category)
 qtgui_pythondir = $(pythondir)/$(qtgui_pythondir_category)
 qtgui_pylibdir = $(pyexecdir)/$(qtgui_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.
+qtgui_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/qtgui
+# FIXME: determince whether these should be installed with gnuradio.
+qtgui_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 qtgui_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += qtgui.py qtgui_python.cc
+if GUILE
+swig_built_sources += qtgui.scm qtgui_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 @@ qtgui_python_PYTHON =			\
 	$(qtgui_python)
 
 if GUILE
-qtgui_pylib_LTLIBRARIES += _qtgui_guile.la
-
+qtgui_scmlib_LTLIBRARIES = _qtgui_guile.la
 _qtgui_guile_la_SOURCES = 		\
-	qtgui_guile.cc		\
+	qtgui_guile.cc		        \
 	$(qtgui_la_swig_sources)
+qtgui_scm_DATA = qtgui.scm
 
 # Guile can use the same flags as python does
 _qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
+# $(python_deps) $(guile_deps): qtgui.i
+qtgui_python.h qtgui.py qtgui_python.cc: qtgui.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 @@ qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-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,32 +219,23 @@ qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/qtgui-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.
+qtgui_guile.h qtgui.scm qtgui_guile.cc: qtgui.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
-		-MD -MF $(DEPDIR)/qtgui_guile.Std \
-		-module qtgui -o qtgui_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/qtgui_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \
-			> $(DEPDIR)/qtgui_guile.Sd; \
-		$(RM) $(DEPDIR)/qtgui_guile.Std; \
-		$(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/qtgui-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/qtgui-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/qtgui-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/qtgui-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-	$(RM) $(DEPDIR)/qtgui_guile.d
-	cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d
-	echo "" >> $(DEPDIR)/qtgui_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d
-	$(RM) $(DEPDIR)/qtgui_guile.Std
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/qtgui-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -299,3 +303,36 @@ $(DEPDIR)/qtgui-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/qtgui_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/qtgui-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) $(qtgui_swig_args) \
+		-MD -MF $(DEPDIR)/qtgui_guile.Std \
+		-module qtgui -o qtgui_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/qtgui_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \
+			> $(DEPDIR)/qtgui_guile.Sd; \
+		$(RM) $(DEPDIR)/qtgui_guile.Std; \
+		$(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+	$(RM) $(DEPDIR)/qtgui_guile.d
+	cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d
+	echo "" >> $(DEPDIR)/qtgui_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d
+	$(RM) $(DEPDIR)/qtgui_guile.Std
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+else
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+
-- 
cgit 


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

---
 gr-qtgui/src/lib/Makefile.swig.gen | 241 ++++---------------------------------
 1 file changed, 25 insertions(+), 216 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 8759ce00d..5b66e6e0c 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -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 += qtgui.py qtgui_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 += qtgui.py
 if GUILE
-swig_built_sources += qtgui.scm qtgui_guile.cc
+swig_built_sources += qtgui.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,50 @@ qtgui_swiginclude_HEADERS =		\
 	$(qtgui_swiginclude_headers)
 
 qtgui_pylib_LTLIBRARIES =		\
-	_qtgui_python.la
+	_qtgui.la
 
-_qtgui_python_la_SOURCES = 		\
-	qtgui_python.cc		\
+_qtgui_la_SOURCES = 			\
+	python/qtgui.cc		\
 	$(qtgui_la_swig_sources)
 
-_qtgui_python_la_LIBADD =		\
+_qtgui_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
 
-_qtgui_python_la_LDFLAGS =		\
+# _qtgui_la_DEPENDENCIES = python/qtgui.lo
+
+_qtgui_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
 
-_qtgui_python_la_CXXFLAGS =		\
+_qtgui_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(qtgui_la_swig_cxxflags)
 
 qtgui_python_PYTHON =			\
 	qtgui.py			\
-	$(qtgui_python)
+	$(qtgui)
 
 if GUILE
-qtgui_scmlib_LTLIBRARIES = _qtgui_guile.la
-_qtgui_guile_la_SOURCES = 		\
-	qtgui_guile.cc		        \
+qtgui_scmlib_LTLIBRARIES = qtgui_guile.la
+qtgui_guile_la_SOURCES = 		\
+	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
 qtgui_scm_DATA = qtgui.scm
 
 # Guile can use the same flags as python does
-_qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD)
-_qtgui_guile_la_LDFLAGS = $(_qtgui_python_la_LDFLAGS)
-_qtgui_guile_la_CXXFLAGS = $(_qtgui_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+qtgui_guile_la_LIBADD = $(_qtgui_la_LIBADD)
+qtgui_guile_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
+qtgui_guile_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): qtgui.i
-qtgui_python.h qtgui.py qtgui_python.cc: qtgui.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)/qtgui-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)/qtgui-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)/qtgui-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)/qtgui-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-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)/qtgui-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)/qtgui-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)/qtgui-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/qtgui.lo: qtgui.lo
+qtgui.scm: qtgui.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.
-qtgui_guile.h qtgui.scm qtgui_guile.cc: qtgui.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/qtgui-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/qtgui-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/qtgui-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/qtgui-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/qtgui-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) $(qtgui_swig_args) \
-		-MD -MF $(DEPDIR)/qtgui_python.Std \
-		-module qtgui -o qtgui_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/qtgui_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_python.Std \
-			> $(DEPDIR)/qtgui_python.Sd; \
-		$(RM) $(DEPDIR)/qtgui_python.Std; \
-		$(MV) $(DEPDIR)/qtgui_python.Sd $(DEPDIR)/qtgui_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/qtgui_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)/qtgui_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/qtgui_python.Std $(DEPDIR)/qtgui_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/qtgui_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)/qtgui_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/qtgui_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)/qtgui-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)/qtgui_python.d@am__quote@
-
-if GUILE
-$(DEPDIR)/qtgui-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) $(qtgui_swig_args) \
-		-MD -MF $(DEPDIR)/qtgui_guile.Std \
-		-module qtgui -o qtgui_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/qtgui_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \
-			> $(DEPDIR)/qtgui_guile.Sd; \
-		$(RM) $(DEPDIR)/qtgui_guile.Std; \
-		$(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-	$(RM) $(DEPDIR)/qtgui_guile.d
-	cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d
-	echo "" >> $(DEPDIR)/qtgui_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d
-	$(RM) $(DEPDIR)/qtgui_guile.Std
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-else
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@
+python/qtgui.lo:
+qtgui.lo: qtgui.py qtgui.scm
+qtgui.py: qtgui.i
 
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
cgit 


From 32a71023bf7350167fdd4f3797d384d47cafd71f Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:17:11 -0600
Subject: add python/*.cc to SOURCES so dependencies work properly.

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1ee3c8e3d..dce8f1bd5 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -53,7 +53,8 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	spectrumUpdateEvents.cc			\
 	plot_waterfall.cc			\
 	qtgui_sink_c.cc				\
-	qtgui_sink_f.cc
+	qtgui_sink_f.cc				\
+	python/qtgui.cc
 
 nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES)
 
-- 
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-qtgui/src/lib/Makefile.swig.gen | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 5b66e6e0c..866dd3e6f 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -41,12 +41,12 @@ qtgui_pylibdir = $(pyexecdir)/$(qtgui_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.
-qtgui_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+qtgui_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/qtgui
 # FIXME: determince whether these should be installed with gnuradio.
-qtgui_scmdir = @GUILE_PKDATADIR@/gnuradio
+qtgui_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -144,4 +144,5 @@ python/qtgui.lo:
 qtgui.lo: qtgui.py qtgui.scm
 qtgui.py: qtgui.i
 
+-include python/qtgui.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-qtgui/src/lib/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 866dd3e6f..b6551eadb 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -41,7 +41,7 @@ qtgui_pylibdir = $(pyexecdir)/$(qtgui_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.
-qtgui_scmlibdir = $(libdir)/guile/gnuradio
+qtgui_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/qtgui
@@ -124,16 +124,16 @@ qtgui_python_PYTHON =			\
 	$(qtgui)
 
 if GUILE
-qtgui_scmlib_LTLIBRARIES = qtgui_guile.la
-qtgui_guile_la_SOURCES = 		\
+qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
+libguile_qtgui_la_SOURCES = 		\
 	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
 qtgui_scm_DATA = qtgui.scm
 
 # Guile can use the same flags as python does
-qtgui_guile_la_LIBADD = $(_qtgui_la_LIBADD)
-qtgui_guile_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
-qtgui_guile_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
+libguile_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
+libguile_qtgui_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
+libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
 
 guile/qtgui.lo: qtgui.lo
 qtgui.scm: qtgui.i
-- 
cgit 


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

---
 gr-qtgui/src/lib/qtgui.i | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i
index 1f50bf43c..65ff948d0 100644
--- a/gr-qtgui/src/lib/qtgui.i
+++ b/gr-qtgui/src/lib/qtgui.i
@@ -120,3 +120,12 @@ public:
   void set_constellation_pen_size(int size);
 };
 
+#if SWIGGUILE
+%scheme %{
+(load-extension "libguile-qtgui" "scm_init_gnuradio_qtgui_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
-- 
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-qtgui/src/lib/Makefile.swig.gen | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index b6551eadb..52c8a7473 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ qtgui_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/qtgui
 # FIXME: determince whether these should be installed with gnuradio.
-qtgui_scmdir = $(guiledir)/gnuradio
+qtgui_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
 libguile_qtgui_la_SOURCES = 		\
 	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
-qtgui_scm_DATA = qtgui.scm
+nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
 
 guile/qtgui.lo: qtgui.lo
 qtgui.scm: qtgui.i
+gnuradio/qtgui-primitive.scm: qtgui.scm
+
+-include guile/qtgui.d
 
 endif				# end of GUILE
 
-- 
cgit 


From 0282499102abcef25849ae3a5255902502c1382a Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 13:24:29 -0700
Subject: Remove swig generated python code from C++-only libraries

---
 gr-qtgui/src/lib/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index dce8f1bd5..1ee3c8e3d 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -53,8 +53,7 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	spectrumUpdateEvents.cc			\
 	plot_waterfall.cc			\
 	qtgui_sink_c.cc				\
-	qtgui_sink_f.cc				\
-	python/qtgui.cc
+	qtgui_sink_f.cc
 
 nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES)
 
-- 
cgit 


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

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 52c8a7473..aeb0af304 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/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 += qtgui.py
-if GUILE
-swig_built_sources += qtgui.scm
-endif
+# swig_built_sources += qtgui.py
+# if GUILE
+# swig_built_sources += gnuradio/qtgui.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_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
 libguile_qtgui_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
 libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
 
-guile/qtgui.lo: qtgui.lo
-qtgui.scm: qtgui.i
-gnuradio/qtgui-primitive.scm: qtgui.scm
+guile/qtgui.cc: gnuradio/qtgui.scm
+gnuradio/qtgui.scm: qtgui.i
+gnuradio/qtgui-primitive.scm: gnuradio/qtgui.scm
 
 -include guile/qtgui.d
 
 endif				# end of GUILE
 
-python/qtgui.lo:
 qtgui.lo: qtgui.py qtgui.scm
 qtgui.py: qtgui.i
 
-- 
cgit 


From 0939607d0b4a3ae047ceff60fab300000c7d2069 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 1 Nov 2010 19:02:55 -0600
Subject: regenerated

---
 gr-qtgui/src/lib/Makefile.swig.gen | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index aeb0af304..6adf72209 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ qtgui_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)/qtgui-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 += qtgui.py
-# if GUILE
-# swig_built_sources += gnuradio/qtgui.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 @@ _qtgui_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
 
-# _qtgui_la_DEPENDENCIES = python/qtgui.lo
-
 _qtgui_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
@@ -123,14 +103,20 @@ qtgui_python_PYTHON =			\
 	qtgui.py			\
 	$(qtgui)
 
+python/qtgui.cc: qtgui.py
+qtgui.py: qtgui.i
+
+# Include the python dependencies for this file
+-include python/qtgui.d
+# end of PYTHON
+
 if GUILE
 qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
-libguile_qtgui_la_SOURCES = 		\
-	guile/qtgui.cc			\
+libguile_qtgui_la_SOURCES = \
+	guile/qtgui.cc				       \
 	$(qtgui_la_swig_sources)
 nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
 libguile_qtgui_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
 libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/qtgui.cc: gnuradio/qtgui.scm
 gnuradio/qtgui.scm: qtgui.i
 gnuradio/qtgui-primitive.scm: gnuradio/qtgui.scm
 
+# Include the guile dependencies for this file
 -include guile/qtgui.d
 
 endif				# end of GUILE
 
-qtgui.lo: qtgui.py qtgui.scm
-qtgui.py: qtgui.i
-
--include python/qtgui.d
 
-- 
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-qtgui/src/lib/Makefile.swig.gen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 6adf72209..feacbe738 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -112,8 +112,8 @@ qtgui.py: qtgui.i
 
 if GUILE
 qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
-libguile_qtgui_la_SOURCES = \
-	guile/qtgui.cc				       \
+libguile_qtgui_la_SOURCES =		\
+	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
 nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm
 
-- 
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-qtgui/src/lib/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index feacbe738..b783e9223 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -101,7 +101,7 @@ _qtgui_la_CXXFLAGS =			\
 
 qtgui_python_PYTHON =			\
 	qtgui.py			\
-	$(qtgui)
+	$(qtgui_python)
 
 python/qtgui.cc: qtgui.py
 qtgui.py: qtgui.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-qtgui/src/lib/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index b783e9223..3b8ef3617 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -79,6 +79,7 @@ qtgui_swiginclude_HEADERS =		\
 	qtgui.i			\
 	$(qtgui_swiginclude_headers)
 
+if PYTHON
 qtgui_pylib_LTLIBRARIES =		\
 	_qtgui.la
 
@@ -86,6 +87,10 @@ _qtgui_la_SOURCES = 			\
 	python/qtgui.cc		\
 	$(qtgui_la_swig_sources)
 
+qtgui_python_PYTHON =			\
+	qtgui.py			\
+	$(qtgui_python)
+
 _qtgui_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
@@ -99,27 +104,34 @@ _qtgui_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(qtgui_la_swig_cxxflags)
 
-qtgui_python_PYTHON =			\
-	qtgui.py			\
-	$(qtgui_python)
-
 python/qtgui.cc: qtgui.py
 qtgui.py: qtgui.i
 
 # Include the python dependencies for this file
 -include python/qtgui.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
+
+qtgui_scmlib_LTLIBRARIES = 		\
+	libguile-qtgui.la
 libguile_qtgui_la_SOURCES =		\
 	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
-nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm
-
-libguile_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
-libguile_qtgui_la_LDFLAGS = $(_qtgui_la_LDFLAGS)
-libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
+nobase_qtgui_scm_DATA = 		\
+	gnuradio/qtgui.scm 		\
+	gnuradio/qtgui-primitive.scm
+libguile_qtgui_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(qtgui_la_swig_libadd)
+libguile_qtgui_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(qtgui_la_swig_ldflags)
+libguile_qtgui_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(qtgui_la_swig_cxxflags)
 
 guile/qtgui.cc: gnuradio/qtgui.scm
 gnuradio/qtgui.scm: qtgui.i
-- 
cgit 


From 42fe3e571be14e70cb06ea1244125553f0606be4 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:28:18 -0800
Subject: Removed link to missing .png in an attempt to keep doxygen from
 crashing

---
 gr-qtgui/src/lib/plot_waterfall.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/plot_waterfall.h b/gr-qtgui/src/lib/plot_waterfall.h
index 2be677b10..91746e3f3 100644
--- a/gr-qtgui/src/lib/plot_waterfall.h
+++ b/gr-qtgui/src/lib/plot_waterfall.h
@@ -16,8 +16,6 @@ class QwtColorMap;
   ( the intensity ) is displayed using colors. The colors are calculated
   from the values using a color map.
   
-  \image html spectrogram3.png
-
   \sa QwtRasterData, QwtColorMap
 */
 
-- 
cgit 


From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: Major Makefile.am housecleaning.  Passes distcheck.

Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
---
 gr-qtgui/src/lib/Makefile.am    | 24 +++++++-----------------
 gr-qtgui/src/python/Makefile.am |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1ee3c8e3d..b45b25c9d 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -20,6 +20,9 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+EXTRA_DIST += spectrumdisplayform.ui
 
 AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
               $(QT_INCLUDES) $(WITH_INCLUDES)
@@ -34,9 +37,7 @@ QMAKE_SOURCES = 				\
 	ConstellationDisplayPlot.moc.cc		\
 	spectrumdisplayform.ui.h
 
-EXTRA_DIST = spectrumdisplayform.ui
-
-BUILT_SOURCES = $(QMAKE_SOURCES)
+BUILT_SOURCES += $(QMAKE_SOURCES)
 
 # Build the normal library for C++ apps to link against
 lib_LTLIBRARIES = libgnuradio-qtgui.la
@@ -55,7 +56,7 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	qtgui_sink_c.cc				\
 	qtgui_sink_f.cc
 
-nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES)
+nodist_libgnuradio_qtgui_la_SOURCES=$(QMAKE_SOURCES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
@@ -88,9 +89,9 @@ libgnuradio_qtgui_la_LIBADD = 		\
 	-lstdc++		\
 	$(QT_LIBS)
 
-if PYTHON
+
 ##############################
-# SWIG interface and library
+# SWIG interfaces and libraries
 
 TOP_SWIG_IFILES = 		\
 	qtgui.i
@@ -105,14 +106,3 @@ qtgui_pythondir_category =	\
 # additional libraries for linking with the SWIG-generated library
 qtgui_la_swig_libadd =		\
 	libgnuradio-qtgui.la
-
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES += 		\
-	$(swig_built_sources)
-endif
-
-# Do not distribute built sources, they may contain generated paths
-# which are invalid on other systems
-no_dist_files = $(BUILT_SOURCES)
diff --git a/gr-qtgui/src/python/Makefile.am b/gr-qtgui/src/python/Makefile.am
index 5544748df..31df63a44 100644
--- a/gr-qtgui/src/python/Makefile.am
+++ b/gr-qtgui/src/python/Makefile.am
@@ -29,7 +29,7 @@ noinst_PYTHON = 		\
 	usrp2_display.py	\
 	usrp_display.py
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	qt_digital_window.ui
 
 qtguipythondir = $(grpythondir)/qtgui
-- 
cgit 


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

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/.gitignore b/gr-qtgui/src/lib/.gitignore
index 11bb4342a..61b9ca8c1 100644
--- a/gr-qtgui/src/lib/.gitignore
+++ b/gr-qtgui/src/lib/.gitignore
@@ -11,3 +11,6 @@
 /spectrumdisplayform.ui.h
 /FrequencyDisplayPlot.moc.cc
 /ConstellationDisplayPlot.moc.cc
+/gnuradio
+/guile
+/python
-- 
cgit 


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

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i
index 65ff948d0..063e78806 100644
--- a/gr-qtgui/src/lib/qtgui.i
+++ b/gr-qtgui/src/lib/qtgui.i
@@ -122,7 +122,7 @@ public:
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-qtgui" "scm_init_gnuradio_qtgui_module")
+(load-extension "libguile-gnuradio-qtgui" "scm_init_gnuradio_qtgui_module")
 %}
 
 %goops %{
-- 
cgit 


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

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index 3b8ef3617..9c4c0b58c 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 qtgui_scmlib_LTLIBRARIES = 		\
-	libguile-qtgui.la
-libguile_qtgui_la_SOURCES =		\
+	libguile-gnuradio-qtgui.la
+libguile_gnuradio_qtgui_la_SOURCES =	\
 	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
 nobase_qtgui_scm_DATA = 		\
 	gnuradio/qtgui.scm 		\
 	gnuradio/qtgui-primitive.scm
-libguile_qtgui_la_LIBADD = 		\
+libguile_gnuradio_qtgui_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
-libguile_qtgui_la_LDFLAGS = 		\
+libguile_gnuradio_qtgui_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
-libguile_qtgui_la_CXXFLAGS = 		\
+libguile_gnuradio_qtgui_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(qtgui_la_swig_cxxflags)
-- 
cgit 


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

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

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i
index 063e78806..bb64c6ae2 100644
--- a/gr-qtgui/src/lib/qtgui.i
+++ b/gr-qtgui/src/lib/qtgui.i
@@ -122,7 +122,7 @@ public:
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio-qtgui" "scm_init_gnuradio_qtgui_module")
+(load-extension-global "libguile-gnuradio-qtgui" "scm_init_gnuradio_qtgui_module")
 %}
 
 %goops %{
-- 
cgit 


From 472176780edc5dcaaa9a80af5e73355e9e4470d5 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 17:34:02 -0800
Subject: qtgui plot waterfall fix

Removed QWT_EXPORT from PlotWaterfall.
PlotWaterfall is not part of libqwt, this is likely a copy/paste typo.
Its very wrong and specifies incorrect linkage. Affects MSVC.
---
 gr-qtgui/src/lib/plot_waterfall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/plot_waterfall.h b/gr-qtgui/src/lib/plot_waterfall.h
index 91746e3f3..a11461611 100644
--- a/gr-qtgui/src/lib/plot_waterfall.h
+++ b/gr-qtgui/src/lib/plot_waterfall.h
@@ -19,7 +19,7 @@ class QwtColorMap;
   \sa QwtRasterData, QwtColorMap
 */
 
-class QWT_EXPORT PlotWaterfall: public QwtPlotRasterItem
+class PlotWaterfall: public QwtPlotRasterItem
 {
 public:
     explicit PlotWaterfall(WaterfallData* data, const QString &title = QString::null);
-- 
cgit 


From 3a088db9eb79cce564650a7c2c4b4dd744b77ce8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 17:41:27 -0800
Subject: qtgui missing stdint include fix:

These files use stdint types but did not include the header stdint.h
---
 gr-qtgui/src/lib/FrequencyDisplayPlot.h  | 1 +
 gr-qtgui/src/lib/TimeDomainDisplayPlot.h | 1 +
 gr-qtgui/src/lib/WaterfallDisplayPlot.h  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.h b/gr-qtgui/src/lib/FrequencyDisplayPlot.h
index c78e1667e..3c22c1397 100644
--- a/gr-qtgui/src/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.h
@@ -1,6 +1,7 @@
 #ifndef FREQUENCY_DISPLAY_PLOT_HPP
 #define FREQUENCY_DISPLAY_PLOT_HPP
 
+#include <stdint.h>
 #include <cstdio>
 #include <qwt_plot.h>
 #include <qwt_painter.h>
diff --git a/gr-qtgui/src/lib/TimeDomainDisplayPlot.h b/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
index 5525bbabe..952b5c8cf 100644
--- a/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/src/lib/TimeDomainDisplayPlot.h
@@ -1,6 +1,7 @@
 #ifndef TIME_DOMAIN_DISPLAY_PLOT_HPP
 #define TIME_DOMAIN_DISPLAY_PLOT_HPP
 
+#include <stdint.h>
 #include <cstdio>
 #include <qwt_plot.h>
 #include <qwt_painter.h>
diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.h b/gr-qtgui/src/lib/WaterfallDisplayPlot.h
index a5ccaec40..8bd990f2a 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.h
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.h
@@ -1,6 +1,7 @@
 #ifndef WATERFALL_DISPLAY_PLOT_HPP
 #define WATERFALL_DISPLAY_PLOT_HPP
 
+#include <stdint.h>
 #include <cstdio>
 #include <qwt_plot.h>
 #include <qwt_plot_zoomer.h>
-- 
cgit 


From e1fd88db9b7edc13a90b5c81263d062ebcf2932b Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 18:09:38 -0800
Subject: qtgui plots static const fixes:

Initialize static data members in the cpp file:
http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.12

For the WaterfallDisplayPlot, rather than bringing the initialization into the cpp file,
the numbers seemed far more fitting as an enum given that they are by nature.
This removed the symbol declaration from the cpp file, so its actually simpler.
---
 gr-qtgui/src/lib/SpectrumGUIClass.cc     |  4 ++--
 gr-qtgui/src/lib/SpectrumGUIClass.h      |  4 ++--
 gr-qtgui/src/lib/WaterfallDisplayPlot.cc |  6 ------
 gr-qtgui/src/lib/WaterfallDisplayPlot.h  | 12 +++++++-----
 4 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.cc b/gr-qtgui/src/lib/SpectrumGUIClass.cc
index 563ed34ba..052730fc2 100644
--- a/gr-qtgui/src/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/src/lib/SpectrumGUIClass.cc
@@ -6,8 +6,8 @@
 #include <QEvent>
 #include <QCustomEvent>
 
-const long SpectrumGUIClass::MAX_FFT_SIZE;
-const long SpectrumGUIClass::MIN_FFT_SIZE;
+const long SpectrumGUIClass::MAX_FFT_SIZE = 32768;
+const long SpectrumGUIClass::MIN_FFT_SIZE = 1024;
 
 SpectrumGUIClass::SpectrumGUIClass(const uint64_t maxDataSize,
 				   const uint64_t fftSize,
diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.h b/gr-qtgui/src/lib/SpectrumGUIClass.h
index 63a340c34..57a749a6a 100644
--- a/gr-qtgui/src/lib/SpectrumGUIClass.h
+++ b/gr-qtgui/src/lib/SpectrumGUIClass.h
@@ -67,8 +67,8 @@ public:
   void DecrementPendingGUIUpdateEvents();
   void ResetPendingGUIUpdateEvents();
 
-  static const long MAX_FFT_SIZE = /*1048576*/32768;
-  static const long MIN_FFT_SIZE = 1024;
+  static const long MAX_FFT_SIZE;
+  static const long MIN_FFT_SIZE;
 
   QWidget* qwidget();
 
diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
index 680c44756..805af1d8d 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
@@ -210,12 +210,6 @@ private:
 };
 
 
-const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR;
-const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT;
-const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT;
-const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT;
-const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED;
-
 WaterfallDisplayPlot::WaterfallDisplayPlot(QWidget* parent)
   : QwtPlot(parent)
 {
diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.h b/gr-qtgui/src/lib/WaterfallDisplayPlot.h
index a5ccaec40..5f55e91c0 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.h
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.h
@@ -39,11 +39,13 @@ public:
   const QColor GetUserDefinedLowIntensityColor()const;
   const QColor GetUserDefinedHighIntensityColor()const;
 
-  static const int INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0;
-  static const int INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1;
-  static const int INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2;
-  static const int INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3;
-  static const int INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4;
+  enum{
+    INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0,
+    INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1,
+    INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2,
+    INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3,
+    INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4
+  };
 
 public slots:
   void resizeSlot( QSize *s );
-- 
cgit 


From 7cea46f75e3f4f4b0d42de89d7cedd90a0f091e0 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 20:37:09 -0800
Subject: qtgui boost use posix time:

Replace calls to gmtime_r with boost::posix_time
to make the code portable on systems without gmtime_r.
---
 gr-qtgui/src/lib/Makefile.am             | 6 ++++--
 gr-qtgui/src/lib/WaterfallDisplayPlot.cc | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index b45b25c9d..446a07fd0 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.swig
 EXTRA_DIST += spectrumdisplayform.ui
 
 AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) $(WITH_INCLUDES)
+              $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
 
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
@@ -82,10 +82,12 @@ QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LI
 	$(QT_UIC_EXEC) $< -o $@
 
 # magic flags
-libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
+libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) $(LTVERSIONFLAGS)
 
 libgnuradio_qtgui_la_LIBADD = 		\
 	$(GNURADIO_CORE_LA)	\
+	$(BOOST_THREAD_LIB) \
+	$(BOOST_DATE_TIME_LIB) \
 	-lstdc++		\
 	$(QT_LIBS)
 
diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
index 680c44756..dc8d7b7ac 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
@@ -12,6 +12,8 @@
 
 #include <qapplication.h>
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 class FreqOffsetAndPrecisionClass
 {
 public:
@@ -138,8 +140,7 @@ public:
     QwtText returnLabel("");
 
     timespec lineTime = timespec_add(GetZeroTime(), (-value) * GetSecondsPerLine());
-    struct tm timeTm;
-    gmtime_r(&lineTime.tv_sec, &timeTm);
+    tm timeTm(boost::posix_time::to_tm(boost::posix_time::from_time_t(lineTime.tv_sec)));
     returnLabel = (QString("").sprintf("%04d/%02d/%02d\n%02d:%02d:%02d.%03ld",
 				       timeTm.tm_year+1900, timeTm.tm_mon+1,
 				       timeTm.tm_mday, timeTm.tm_hour, timeTm.tm_min,
@@ -192,8 +193,7 @@ protected:
     QString yLabel("");
 
     timespec lineTime = timespec_add(GetZeroTime(), (-p.y()) * GetSecondsPerLine());
-    struct tm timeTm;
-    gmtime_r(&lineTime.tv_sec, &timeTm);
+    tm timeTm(boost::posix_time::to_tm(boost::posix_time::from_time_t(lineTime.tv_sec)));
     yLabel = (QString("").sprintf("%04d/%02d/%02d %02d:%02d:%02d.%03ld",
 				  timeTm.tm_year+1900, timeTm.tm_mon+1,
 				  timeTm.tm_mday, timeTm.tm_hour, timeTm.tm_min,
-- 
cgit 


From 82c9301797aae0e8355213827b1e6cbfe0648a39 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 22 Jan 2011 20:48:57 -0800
Subject: qtgui: use the posix time to_simple_string to simplify label text

---
 gr-qtgui/src/lib/WaterfallDisplayPlot.cc | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
index dc8d7b7ac..694dc86d8 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
@@ -13,6 +13,7 @@
 #include <qapplication.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
+namespace pt = boost::posix_time;
 
 class FreqOffsetAndPrecisionClass
 {
@@ -137,15 +138,9 @@ public:
 
   virtual QwtText label(double value) const
   {
-    QwtText returnLabel("");
-
     timespec lineTime = timespec_add(GetZeroTime(), (-value) * GetSecondsPerLine());
-    tm timeTm(boost::posix_time::to_tm(boost::posix_time::from_time_t(lineTime.tv_sec)));
-    returnLabel = (QString("").sprintf("%04d/%02d/%02d\n%02d:%02d:%02d.%03ld",
-				       timeTm.tm_year+1900, timeTm.tm_mon+1,
-				       timeTm.tm_mday, timeTm.tm_hour, timeTm.tm_min,
-				       timeTm.tm_sec, lineTime.tv_nsec/1000000));
-    return returnLabel;
+    std::string time_str = pt::to_simple_string(pt::from_time_t(lineTime.tv_sec));
+    return QwtText(QString("").sprintf("%s.%03ld", time_str.c_str(), lineTime.tv_nsec/1000000));
   }
 
   virtual void initiateUpdate()
@@ -190,14 +185,9 @@ protected:
   using QwtPlotZoomer::trackerText;
   virtual QwtText trackerText( const QwtDoublePoint& p ) const 
   {
-    QString yLabel("");
-
     timespec lineTime = timespec_add(GetZeroTime(), (-p.y()) * GetSecondsPerLine());
-    tm timeTm(boost::posix_time::to_tm(boost::posix_time::from_time_t(lineTime.tv_sec)));
-    yLabel = (QString("").sprintf("%04d/%02d/%02d %02d:%02d:%02d.%03ld",
-				  timeTm.tm_year+1900, timeTm.tm_mon+1,
-				  timeTm.tm_mday, timeTm.tm_hour, timeTm.tm_min,
-				  timeTm.tm_sec, lineTime.tv_nsec/1000000));
+    std::string time_str = pt::to_simple_string(pt::from_time_t(lineTime.tv_sec));
+    QString yLabel(QString("").sprintf("%s.%03ld", time_str.c_str(), lineTime.tv_nsec/1000000));
 
     QwtText t(QString("%1 %2, %3").
 	      arg(p.x(), 0, 'f', GetFrequencyPrecision()).
-- 
cgit 


From fc806ce5d72807a47d479aecaddb2239722d5fb0 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 23 Jan 2011 12:52:07 -0500
Subject: Removing YYYY-mmm-DD from time displayed on Waterfall plot.

---
 gr-qtgui/src/lib/WaterfallDisplayPlot.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gr-qtgui/src')

diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
index 694dc86d8..d7421f06e 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
@@ -140,6 +140,11 @@ public:
   {
     timespec lineTime = timespec_add(GetZeroTime(), (-value) * GetSecondsPerLine());
     std::string time_str = pt::to_simple_string(pt::from_time_t(lineTime.tv_sec));
+
+    // lops off the YYYY-mmm-DD part of the string
+    int ind =  time_str.find(" ");
+    if(ind != std::string::npos)
+      time_str = time_str.substr(ind);
     return QwtText(QString("").sprintf("%s.%03ld", time_str.c_str(), lineTime.tv_nsec/1000000));
   }
 
@@ -187,6 +192,11 @@ protected:
   {
     timespec lineTime = timespec_add(GetZeroTime(), (-p.y()) * GetSecondsPerLine());
     std::string time_str = pt::to_simple_string(pt::from_time_t(lineTime.tv_sec));
+
+    // lops off the YYYY-mmm-DD part of the string
+    int ind =  time_str.find(" ");
+    if(ind != std::string::npos)
+      time_str = time_str.substr(ind);
     QString yLabel(QString("").sprintf("%s.%03ld", time_str.c_str(), lineTime.tv_nsec/1000000));
 
     QwtText t(QString("%1 %2, %3").
-- 
cgit