diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-06-13 11:59:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-06-13 11:59:13 -0700 |
| commit | 51416adfdc330fe0d4edbfcd5df839de66ef2759 (patch) | |
| tree | db8003f821f23d4ad3c11017e65d139585dc11e7 | |
| parent | c85f8b729f397dbe938630da5d47b85977e78215 (diff) | |
| parent | b23cc175656c0507ee4f45a065bc48ab0f85095f (diff) | |
Merge remote branch 'trondeau/qtmake' into maint
* trondeau/qtmake:
Fixes gr-qtgui make distcheck failure when QT is not installed.
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 26b97d1d45..6d4a91257b 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008,2009 Free Software Foundation, Inc. +# Copyright 2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -54,7 +54,6 @@ libgnuradio_qtgui_la_SOURCES = \ SpectrumGUIClass.cc \ spectrumUpdateEvents.cc \ plot_waterfall.cc \ - $(QMAKE_SOURCES) \ qtgui_sink_c.cc \ qtgui_sink_f.cc @@ -75,6 +74,8 @@ grinclude_HEADERS = \ qtgui_sink_c.h \ qtgui_sink_f.h +nodist_libqtsrc_la_SOURCES = $(QMAKE_SOURCES) + %_moc.cc : %.h $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -p $(srcdir) $< -o $@ |