diff options
| author | Tom | 2009-10-13 22:46:51 -0400 |
|---|---|---|
| committer | Tom | 2009-10-13 22:46:51 -0400 |
| commit | b41666e7c0fe2a8075efc14b273f74bd838f6564 (patch) | |
| tree | 6d300fa780b577bed7c8ba17dc35125a5c154564 /gr-qtgui/src/lib/Makefile.am | |
| parent | 068c84168c35858197b18835ade10c8cebc180ae (diff) | |
| download | gnuradio-b41666e7c0fe2a8075efc14b273f74bd838f6564.tar.gz gnuradio-b41666e7c0fe2a8075efc14b273f74bd838f6564.tar.bz2 gnuradio-b41666e7c0fe2a8075efc14b273f74bd838f6564.zip | |
Removing ifs to clean up build system. Make no longer rebuilds gr-qtgui if no changes are made and also passes 'make distcheck'.
Diffstat (limited to 'gr-qtgui/src/lib/Makefile.am')
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 10 |
1 files changed, 0 insertions, 10 deletions
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 |