diff options
Diffstat (limited to 'gr-qtgui')
-rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 7 | ||||
-rw-r--r-- | gr-qtgui/src/lib/waterfallGlobalData.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 814bee136..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 $@ @@ -82,7 +83,7 @@ grinclude_HEADERS = \ $(QT_UIC_EXEC) $< -o $@ # magic flags -libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgnuradio_qtgui_la_LIBADD = \ $(GNURADIO_CORE_LA) \ diff --git a/gr-qtgui/src/lib/waterfallGlobalData.h b/gr-qtgui/src/lib/waterfallGlobalData.h index 6e34ce5b1..247e0ae91 100644 --- a/gr-qtgui/src/lib/waterfallGlobalData.h +++ b/gr-qtgui/src/lib/waterfallGlobalData.h @@ -3,6 +3,7 @@ #include <qwt_raster_data.h> #include <qwt3d_function.h> +#include <inttypes.h> class Waterfall3DDisplayPlot; |