X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-qtgui%2Fsrc%2Flib%2FMakefile.am;fp=gr-qtgui%2Fsrc%2Flib%2FMakefile.am;h=1ee3c8e3d282eebbfcc17e33f9e6c10db69838ae;hb=2924c0e740bbb9106bfed602345daaee5606d62a;hp=26b97d1d45f0f27426c6ed3bb74e6ec2ccff0a04;hpb=94d315e556805fb75784964499472977664809c4;p=debian%2Fgnuradio

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 26b97d1d..1ee3c8e3 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
 # 
@@ -21,19 +21,18 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) -I. $(WITH_INCLUDES)
+AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+              $(QT_INCLUDES) $(WITH_INCLUDES)
 
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
 QMAKE_SOURCES = 				\
-	spectrumdisplayform_moc.cc		\
-	FrequencyDisplayPlot_moc.cc	 	\
-	TimeDomainDisplayPlot_moc.cc		\
-	WaterfallDisplayPlot_moc.cc		\
-	Waterfall3DDisplayPlot_moc.cc		\
-	ConstellationDisplayPlot_moc.cc		\
-	spectrumdisplayform_ui.h
+	spectrumdisplayform.moc.cc		\
+	FrequencyDisplayPlot.moc.cc	 	\
+	TimeDomainDisplayPlot.moc.cc		\
+	WaterfallDisplayPlot.moc.cc		\
+	ConstellationDisplayPlot.moc.cc		\
+	spectrumdisplayform.ui.h
 
 EXTRA_DIST = spectrumdisplayform.ui
 
@@ -47,23 +46,22 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	FrequencyDisplayPlot.cc 		\
 	TimeDomainDisplayPlot.cc		\
 	WaterfallDisplayPlot.cc			\
-	Waterfall3DDisplayPlot.cc		\
 	waterfallGlobalData.cc			\
 	ConstellationDisplayPlot.cc		\
 	spectrumdisplayform.cc			\
 	SpectrumGUIClass.cc			\
 	spectrumUpdateEvents.cc			\
 	plot_waterfall.cc			\
-	$(QMAKE_SOURCES)			\
 	qtgui_sink_c.cc				\
 	qtgui_sink_f.cc
 
+nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES)
+
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
 	FrequencyDisplayPlot.h		\
 	TimeDomainDisplayPlot.h		\
 	WaterfallDisplayPlot.h		\
-	Waterfall3DDisplayPlot.h	\
 	waterfallGlobalData.h		\
 	ConstellationDisplayPlot.h	\
 	highResTimeFunctions.h		\
@@ -75,10 +73,11 @@ grinclude_HEADERS =			\
 	qtgui_sink_c.h			\
 	qtgui_sink_f.h
 
-%_moc.cc : %.h
-	$(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -p $(srcdir) $< -o $@
+QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+%.moc.cc : %.h
+	$(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@
 
-%_ui.h : %.ui
+%.ui.h : %.ui
 	$(QT_UIC_EXEC) $< -o $@
 
 # magic flags