From 4a1dfe6b13a6ea839e1e6f4792d5f8992c495594 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 27 Mar 2011 13:10:40 -0400
Subject: gr-qtgui: wip: moving and renaming files for new structure.

---
 gr-qtgui/swig/Makefile.am | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 gr-qtgui/swig/Makefile.am

(limited to 'gr-qtgui/swig/Makefile.am')

diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
new file mode 100644
index 000000000..812d1caca
--- /dev/null
+++ b/gr-qtgui/swig/Makefile.am
@@ -0,0 +1,63 @@
+#
+# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gr-qtgui/lib \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(PYTHON_CPPFLAGS) \
+	$(WITH_INCLUDES)
+
+if GUILE
+nobase_guile_DATA = \
+	gnuradio/qtgui.scm
+endif
+
+noinst_GUILE  = qtgui.test
+
+
+##############################
+# SWIG interface and library
+TOP_SWIG_IFILES = \
+	qtgui_swig.i
+
+# Install so that they end up available as:
+#   import gnuradio.qtgui
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/qtgui
+qtgui_swig_pythondir_category = \
+	gnuradio/qtgui
+
+# additional libraries for linking with the SWIG-generated library
+qtgui_swig_la_swig_libadd = \
+	$(abs_top_builddir)/gr-qtgui/lib/libgnuradio-qtgui.la
+
+# additional SWIG files to be installed
+qtgui_swig_swiginclude_headers = 
+
+if GUILE
+TESTS += run_guile_tests
+endif
\ No newline at end of file
-- 
cgit 


From 147143f58f50210c5ad2dc66d00d12237183d428 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 27 Mar 2011 14:11:26 -0400
Subject: gr-qtgui: qtgui builds and passes make check under new structure.

---
 gr-qtgui/swig/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gr-qtgui/swig/Makefile.am')

diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index 812d1caca..ab1acce71 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -27,8 +27,10 @@ EXTRA_DIST += $(nobase_guile_DATA)
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gr-qtgui/lib \
+	-I$(top_builddir)/gr-qtgui/lib \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(PYTHON_CPPFLAGS) \
+	$(QT_INCLUDES) \
 	$(WITH_INCLUDES)
 
 if GUILE
-- 
cgit 


From 42caa092c83be06df3c2f38a39285096bf8a4cfe Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 9 Apr 2011 23:16:02 -0400
Subject: gr-qtgui: removing Guile-specific stuff since there is no way QtGui
 will work with Guile yet. Changed Python QA to complete properly.

---
 gr-qtgui/swig/Makefile.am | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'gr-qtgui/swig/Makefile.am')

diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index ab1acce71..460868701 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -33,14 +33,6 @@ AM_CPPFLAGS = \
 	$(QT_INCLUDES) \
 	$(WITH_INCLUDES)
 
-if GUILE
-nobase_guile_DATA = \
-	gnuradio/qtgui.scm
-endif
-
-noinst_GUILE  = qtgui.test
-
-
 ##############################
 # SWIG interface and library
 TOP_SWIG_IFILES = \
@@ -59,7 +51,3 @@ qtgui_swig_la_swig_libadd = \
 
 # additional SWIG files to be installed
 qtgui_swig_swiginclude_headers = 
-
-if GUILE
-TESTS += run_guile_tests
-endif
\ No newline at end of file
-- 
cgit 


From ef619231cd6f8b6fcf4548a8422aafd3d2d07a17 Mon Sep 17 00:00:00 2001
From: Mike Cornelius
Date: Sun, 10 Apr 2011 22:24:37 -0400
Subject: gr-qtgui: rearranging swig directory to allow other .i files; adding
 a qtgui2 interface file.

---
 gr-qtgui/swig/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gr-qtgui/swig/Makefile.am')

diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index 460868701..8c695ba5b 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright 2004-2006,2008-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -50,4 +50,5 @@ qtgui_swig_la_swig_libadd = \
 	$(abs_top_builddir)/gr-qtgui/lib/libgnuradio-qtgui.la
 
 # additional SWIG files to be installed
-qtgui_swig_swiginclude_headers = 
+qtgui_swig_swiginclude_headers = 	\
+	qtgui.i
-- 
cgit