diff options
| author | Johnathan Corgan | 2009-10-13 21:03:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-10-13 21:03:19 -0700 |
| commit | a82c784262b9eae78f4c2157b6434495f8ff76bc (patch) | |
| tree | 91d051d267e7f5eeec5ec5916cecba8fe59dd553 | |
| parent | 70709caa2cc5990df6e735186e0d7db97f6a0944 (diff) | |
| parent | b41666e7c0fe2a8075efc14b273f74bd838f6564 (diff) | |
| download | gnuradio-a82c784262b9eae78f4c2157b6434495f8ff76bc.tar.gz gnuradio-a82c784262b9eae78f4c2157b6434495f8ff76bc.tar.bz2 gnuradio-a82c784262b9eae78f4c2157b6434495f8ff76bc.zip | |
Merge branch 'qtmake' of git@gnuradio.org:trondeau into master
* 'qtmake' of git@gnuradio.org:trondeau:
Removing ifs to clean up build system. Make no longer rebuilds gr-qtgui if no changes are made and also passes 'make distcheck'.
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 6 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index d9700776c..84514d7ce 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 b6c8f3f4d..6c90c31f0 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 |