12 files changed, 47 insertions, 10 deletions
diff --git a/Makefile.common b/Makefile.common
index a287a293d..8faf64586 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -96,6 +96,10 @@ USRP_LA = @usrp_LA@
 GR_DIGITAL_INCLUDES = @gr_digital_INCLUDES@
 GR_DIGITAL_LA = @gr_digital_LA@
 
+# GR-QTGUI includes and libraries
+GR_QTGUI_INCLUDES = @gr_qtgui_INCLUDES@
+GR_QTGUI_LA = @gr_qtgui_LA@
+
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make
 RM=$(RM_PROG) -f
diff --git a/gr-qtgui/Makefile.am b/gr-qtgui/Makefile.am
index 38033e1ac..e850567cc 100644
--- a/gr-qtgui/Makefile.am
+++ b/gr-qtgui/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = lib
+SUBDIRS = include lib doc
 
 if PYTHON
 SUBDIRS += swig python apps grc examples
diff --git a/gr-qtgui/include/Makefile.am b/gr-qtgui/include/Makefile.am
new file mode 100644
index 000000000..59a030854
--- /dev/null
+++ b/gr-qtgui/include/Makefile.am
@@ -0,0 +1,33 @@
+#
+# 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 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
+
+# These headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = 		\
+	gr_qtgui_api.h		\
+	qtgui_time_sink_c.h	\
+	qtgui_time_sink_f.h	\
+	qtgui_sink_c.h		\
+	qtgui_sink_f.h		\
+	qtgui_util.h
+
+libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-qtgui/lib/gr_qtgui_api.h b/gr-qtgui/include/gr_qtgui_api.h
index 65033a093..65033a093 100644
--- a/gr-qtgui/lib/gr_qtgui_api.h
+++ b/gr-qtgui/include/gr_qtgui_api.h
diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/include/qtgui_sink_c.h
index b0946885c..b0946885c 100644
--- a/gr-qtgui/lib/qtgui_sink_c.h
+++ b/gr-qtgui/include/qtgui_sink_c.h
diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/include/qtgui_sink_f.h
index 30db05eea..30db05eea 100644
--- a/gr-qtgui/lib/qtgui_sink_f.h
+++ b/gr-qtgui/include/qtgui_sink_f.h
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.h b/gr-qtgui/include/qtgui_time_sink_c.h
index 51d5ad183..51d5ad183 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.h
+++ b/gr-qtgui/include/qtgui_time_sink_c.h
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/include/qtgui_time_sink_f.h
index a69d32877..a69d32877 100644
--- a/gr-qtgui/lib/qtgui_time_sink_f.h
+++ b/gr-qtgui/include/qtgui_time_sink_f.h
diff --git a/gr-qtgui/lib/qtgui_util.h b/gr-qtgui/include/qtgui_util.h
index 5b129c7b5..5b129c7b5 100644
--- a/gr-qtgui/lib/qtgui_util.h
+++ b/gr-qtgui/include/qtgui_util.h
diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am
index 849ee8360..b87230b23 100644
--- a/gr-qtgui/lib/Makefile.am
+++ b/gr-qtgui/lib/Makefile.am
@@ -24,8 +24,8 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST += spectrumdisplayform.ui
 
 AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) \
-              -Dlibgnuradio_qtgui_EXPORTS
+	$(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GR_QTGUI_INCLUDES) \
+	$(WITH_INCLUDES) -Dlibgnuradio_qtgui_EXPORTS
 
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
@@ -74,13 +74,7 @@ grinclude_HEADERS =			\
 	spectrumdisplayform.h		\
 	timedisplayform.h		\
 	SpectrumGUIClass.h		\
-	spectrumUpdateEvents.h		\
-	gr_qtgui_api.h			\
-	qtgui_sink_c.h			\
-	qtgui_sink_f.h			\
-	qtgui_time_sink_c.h		\
-	qtgui_time_sink_f.h		\
-	qtgui_util.h
+	spectrumUpdateEvents.h
 
 #QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
diff --git a/gr-qtgui/python/__init__.py b/gr-qtgui/python/__init__.py
index db113bbd3..236f211b1 100644
--- a/gr-qtgui/python/__init__.py
+++ b/gr-qtgui/python/__init__.py
@@ -19,6 +19,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+'''
+This is the gr-qtgui package. This package includes QT-based graphical
+sinks.
+'''
+
 # The presence of this file turns this directory into a Python package
 
 from qtgui_swig import *
diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index 1d8319987..ad6f49e00 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(PYTHON_CPPFLAGS) \
 	$(QT_INCLUDES) \
+	$(GR_QTGUI_INCLUDES) \
 	$(WITH_INCLUDES)
 
 ##############################