gr-qtgui: qtgui builds and passes make check under new structure.

5 files changed, 35 insertions, 1 deletions

diff --git a/gr-qtgui/apps/.gitignore b/gr-qtgui/apps/.gitignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gr-qtgui/apps/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gr-qtgui/swig/.gitignore b/gr-qtgui/swig/.gitignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gr-qtgui/swig/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
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
diff --git a/gr-qtgui/swig/gnuradio/qtgui.scm b/gr-qtgui/swig/gnuradio/qtgui.scm
new file mode 100644
index 000000000..fc650d022
--- /dev/null
+++ b/gr-qtgui/swig/gnuradio/qtgui.scm
@@ -0,0 +1,28 @@
+;;;
+;;; Copyright 2011 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+;;;
+
+;;; Module that just re-exports the qtgui_swig module
+
+(define-module (gnuradio qtgui)
+  #:use-module (gnuradio export-safely)
+  #:use-module (gnuradio qtgui_swig)
+  #:duplicates (merge-generics replace check))
+
+(re-export-all '(gnuradio qtgui_swig))
+
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i
index bb64c6ae2..ba97b4e9a 100644
--- a/gr-qtgui/swig/qtgui_swig.i
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -122,7 +122,7 @@ public:
 
 #if SWIGGUILE
 %scheme %{
-(load-extension-global "libguile-gnuradio-qtgui" "scm_init_gnuradio_qtgui_module")
+(load-extension-global "libguile-gnuradio-qtgui_swig" "scm_init_gnuradio_qtgui_swig_module")
 %}
 
 %goops %{