From b41666e7c0fe2a8075efc14b273f74bd838f6564 Mon Sep 17 00:00:00 2001
From: Tom <trondeau@vt.edu>
Date: Tue, 13 Oct 2009 22:46:51 -0400
Subject: [PATCH] Removing ifs to clean up build system. Make no longer
 rebuilds gr-qtgui if no changes are made and also passes 'make distcheck'.

---
 config/grc_gr_qtgui.m4       |  6 ------
 gr-qtgui/src/lib/Makefile.am | 10 ----------
 2 files changed, 16 deletions(-)

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index d9700776..84514d7c 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -86,12 +86,6 @@ AC_DEFUN([GRC_GR_QTGUI],[
 	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 \
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index b6c8f3f4..6c90c31f 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 
 # 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	 	\
@@ -35,7 +34,6 @@ QMAKE_SOURCES = 				\
 	Waterfall3DDisplayPlot_moc.cc		\
 	ConstellationDisplayPlot_moc.cc		\
 	spectrumdisplayform_ui.h
-endif
 
 EXTRA_DIST = spectrumdisplayform.ui
 
@@ -77,19 +75,11 @@ grinclude_HEADERS =			\
 	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 -p $(srcdir) $< -o $@
 
 %_ui.h : %.ui
 	$(QT_UIC_EXEC) $< -o $@
-else
-%_moc.cc : %.h
-	touch $@
-
-%_ui.h : %.ui
-	touch $@
-endif
 
 # magic flags
 libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-- 
2.30.2