diff options
| author | Johnathan Corgan | 2010-06-13 14:18:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-06-13 14:18:20 -0700 |
| commit | f0b3dab8125979630651e8d016be296ae607c641 (patch) | |
| tree | 2f19fcc7b4d3f373b1e6e98c838cf4c41111bccf | |
| parent | 0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07 (diff) | |
| parent | 51416adfdc330fe0d4edbfcd5df839de66ef2759 (diff) | |
| download | gnuradio-f0b3dab8125979630651e8d016be296ae607c641.tar.gz gnuradio-f0b3dab8125979630651e8d016be296ae607c641.tar.bz2 gnuradio-f0b3dab8125979630651e8d016be296ae607c641.zip | |
Merge branch 'maint'
* maint:
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 26b97d1d4..6d4a91257 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 $@ |