[Commit-gnuradio] r9835 - gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib

[trondeau]

Author: trondeau
Date: 2008-10-25 09:31:13 -0600 (Sat, 25 Oct 2008)
New Revision: 9835

Removed:
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/
Modified:
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.h
Log:
Simplifying Makefile and directory structure

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
        2008-10-25 01:46:26 UTC (rev 9834)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
        2008-10-25 15:31:13 UTC (rev 9835)
@@ -13,7 +13,6 @@
   }
 
   virtual ~FreqPrecisionClass(){
-
   }
 
   virtual unsigned int GetFrequencyPrecision()const{

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-10-25 01:46:26 UTC (rev 9834)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-10-25 15:31:13 UTC (rev 9835)
@@ -32,7 +32,7 @@
 ourlibdir    = $(grpyexecdir)/qtgui
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) -I. -I.ui $(WITH_INCLUDES)
+              $(QT_INCLUDES) -I. $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
@@ -54,12 +54,12 @@
 BUILT_SOURCES =                                \
        qtgui.cc                                \
        qtgui.py                                \
-       .ui/ui_spectrumdisplayform.h            \
-       .moc/moc_spectrumdisplayform.cc         \
-       .moc/moc_FrequencyDisplayPlot.cc        \
-       .moc/moc_TimeDomainDisplayPlot.cc       \
-       .moc/moc_WaterfallDisplayPlot.cc        \
-       .moc/moc_Waterfall3DDisplayPlot.cc
+       spectrumdisplayform_moc.cc              \
+       FrequencyDisplayPlot_moc.cc             \
+       TimeDomainDisplayPlot_moc.cc            \
+       WaterfallDisplayPlot_moc.cc             \
+       Waterfall3DDisplayPlot_moc.cc           \
+       spectrumdisplayform_ui.h                
 
 # This gets qtgui.py installed in the right place
 ourpython_PYTHON =                     \
@@ -83,11 +83,11 @@
        spectrumUpdateEvents.cc                 \
        plot_waterfall.cc                       \
        spectrumdisplayform.ui                  \
-       .moc/moc_spectrumdisplayform.cc         \
-       .moc/moc_FrequencyDisplayPlot.cc        \
-       .moc/moc_TimeDomainDisplayPlot.cc       \
-       .moc/moc_WaterfallDisplayPlot.cc        \
-       .moc/moc_Waterfall3DDisplayPlot.cc      \
+       spectrumdisplayform_moc.cc              \
+       FrequencyDisplayPlot_moc.cc             \
+       TimeDomainDisplayPlot_moc.cc            \
+       WaterfallDisplayPlot_moc.cc             \
+       Waterfall3DDisplayPlot_moc.cc           \
        qtgui_sink_c.cc                         \
        qtgui_sink_f.cc
 
@@ -111,26 +111,12 @@
        qtgui_sink_c.h                  \
        qtgui_sink_f.h
 
-# Compiles ui file(s) to the UI header file; compiles <file>.ui to
-# .ui/ui_<file>.h as listed in BUILT_SOURCES
-$(filter .ui%,$(BUILT_SOURCES)):;
-       /bin/mkdir -p .ui; \
-       echo $(QT_INCLUDES);\
-       echo $(QT_LIBS); \
-       f=$@; \
-       f1=$${f#.ui/ui_}; \
-       $(QT_UIC_EXEC) $(srcdir)/$${f1/.h/.ui} -o $@
+%_moc.cc : %.h
+       $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB 
-DQT_CORE_LIB $< -o $@
 
+%_ui.h : %.ui
+       $(QT_UIC_EXEC) $< -o $@
 
-# extract the class name from the moc file name and passes <file>.h 
-# to the script to build .moc/moc_<file>.cc as listed in BUILT_SOURCES
-$(filter .moc%,$(BUILT_SOURCES)):;
-       /bin/mkdir -p .moc; \
-       f=$@; \
-       f1=$${f#.moc/moc_}; \
-       $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB 
-DQT_CORE_LIB $(srcdir)/$${f1/.cc/.h} -o $@
-
-
 # magic flags
 _qtgui_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 libqtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.h
  2008-10-25 01:46:26 UTC (rev 9834)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/spectrumdisplayform.h
  2008-10-25 15:31:13 UTC (rev 9835)
@@ -1,7 +1,7 @@
 #ifndef SPECTRUM_DISPLAY_FORM_H
 #define SPECTRUM_DISPLAY_FORM_H
 
-#include "ui_spectrumdisplayform.h"
+#include "spectrumdisplayform_ui.h"
 
 class SpectrumGUIClass;
 #include <SpectrumGUIClass.h>