[Commit-gnuradio] r9958 - in gnuradio/trunk: config gr-qtgui/src/lib

[trondeau]

Author: trondeau
Date: 2008-11-09 10:00:34 -0700 (Sun, 09 Nov 2008)
New Revision: 9958

Modified:
   gnuradio/trunk/config/grc_gr_qtgui.m4
   gnuradio/trunk/gr-qtgui/src/lib/Makefile.am
Log:
Merged r9946:9957 from trondeau/qt into trunk. make distcheck works on F9, 
Ubuntu 8.04 and 8.10 with and without qt libraries.

Modified: gnuradio/trunk/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_qtgui.m4       2008-11-08 19:05:33 UTC (rev 
9957)
+++ gnuradio/trunk/config/grc_gr_qtgui.m4       2008-11-09 17:00:34 UTC (rev 
9958)
@@ -78,6 +78,12 @@
        AC_SUBST(QT_UIC_EXEC)
     fi
 
+    if test "$passed" = "no"; then
+        AM_CONDITIONAL(BUILD_QT, false)
+    else
+       AM_CONDITIONAL(BUILD_QT, true)
+    fi
+
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \
         gr-qtgui/src/Makefile \

Modified: gnuradio/trunk/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-qtgui/src/lib/Makefile.am 2008-11-08 19:05:33 UTC (rev 
9957)
+++ gnuradio/trunk/gr-qtgui/src/lib/Makefile.am 2008-11-09 17:00:34 UTC (rev 
9958)
@@ -21,9 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-#SUBDIRS=qtspectrum
-#DIST_SUBDIRS=qtspectrum
-
 # Install this stuff so that it ends up as the gnuradio.qtgui module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio/qtgui
@@ -51,16 +48,25 @@
 # The second is the python wrapper that loads the shared library
 # and knows how to call our extensions.
 
-BUILT_SOURCES =                                \
-       qtgui.cc                                \
-       qtgui.py                                \
+# Only include these files in the build if qtgui passes configure checks
+# This is mostly to help make distcheck pass
+if BUILD_QT
+QMAKE_SOURCES =                                \
        spectrumdisplayform_moc.cc              \
        FrequencyDisplayPlot_moc.cc             \
        TimeDomainDisplayPlot_moc.cc            \
        WaterfallDisplayPlot_moc.cc             \
        Waterfall3DDisplayPlot_moc.cc           \
-       spectrumdisplayform_ui.h                
+       spectrumdisplayform_ui.h
+endif
 
+EXTRA_DIST = spectrumdisplayform.ui
+
+BUILT_SOURCES =                                \
+       qtgui.cc                                \
+       qtgui.py                                \
+       $(QMAKE_SOURCES)
+
 # This gets qtgui.py installed in the right place
 ourpython_PYTHON =                     \
        qtgui.py
@@ -82,12 +88,7 @@
        SpectrumGUIClass.cc                     \
        spectrumUpdateEvents.cc                 \
        plot_waterfall.cc                       \
-       spectrumdisplayform.ui                  \
-       spectrumdisplayform_moc.cc              \
-       FrequencyDisplayPlot_moc.cc             \
-       TimeDomainDisplayPlot_moc.cc            \
-       WaterfallDisplayPlot_moc.cc             \
-       Waterfall3DDisplayPlot_moc.cc           \
+       $(QMAKE_SOURCES)                        \
        qtgui_sink_c.cc                         \
        qtgui_sink_f.cc
 
@@ -111,12 +112,20 @@
        qtgui_sink_c.h                  \
        qtgui_sink_f.h
 
+if BUILD_QT
 %_moc.cc : %.h
        $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB 
-DQT_CORE_LIB $< -o $@
 
 %_ui.h : %.ui
        $(QT_UIC_EXEC) $< -o $@
+else
+%_moc.cc : %.h
+       touch $@
 
+%_ui.h : %.ui
+       touch $@
+endif
+
 # magic flags
 _qtgui_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 libqtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
@@ -144,8 +153,6 @@
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
 
-#EXTRA_DIST=qtspectrum/GNUmakefile
-
 # Don't distribute output of swig
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done