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

[trondeau]

Author: trondeau
Date: 2008-10-15 09:33:22 -0600 (Wed, 15 Oct 2008)
New Revision: 9797

Modified:
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
Log:
cleaning up and making use of the pkg-config discovery of the moc and uic paths.

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-15 15:33:09 UTC (rev 9796)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-10-15 15:33:22 UTC (rev 9797)
@@ -51,9 +51,9 @@
 # The second is the python wrapper that loads the shared library
 # and knows how to call our extensions.
 
-BUILT_SOURCES =                \
-       qtgui.cc                \
-       qtgui.py                \
+BUILT_SOURCES =                                \
+       qtgui.cc                                \
+       qtgui.py                                \
        .ui/ui_spectrumdisplayform.h            \
        .moc/moc_spectrumdisplayform.cc         \
        .moc/moc_FrequencyDisplayPlot.cc        \
@@ -95,16 +95,6 @@
        $(libqtgui_la_SOURCES)          \
        qtgui.cc
 
-moc_OBJECTS =  \
-       .moc/moc_spectrumdisplayform.cc         \
-       .moc/moc_FrequencyDisplayPlot.cc                \
-       .moc/moc_TimeDomainDisplayPlot.cc       \
-       .moc/moc_WaterfallDisplayPlot.cc                \
-       .moc/moc_Waterfall3DDisplayPlot.cc
-
-uic_OBJECTS = \
-       spectrumdisplayform.ui
-
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        spectrumdisplayform.h           \
@@ -121,25 +111,26 @@
        qtgui_sink_c.h                  \
        qtgui_sink_f.h
 
-# Compiles spectrumdisplayform.ui to the UI header file
-.ui/ui_spectrumdisplayform.h: %.h: spectrumdisplayform.ui
+# 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; \
-       /usr/bin/uic-qt4 $(srcdir)/spectrumdisplayform.ui -o $@
+       echo $(QT_INCLUDES);\
+       echo $(QT_LIBS); \
+       f=$@; \
+       f1=$${f#.ui/ui_}; \
+       $(QT_UIC_EXEC) $(srcdir)/$${f1/.h/.ui} -o $@
 
 
-# Compiles the moc header files into the .moc/moc_*.cc versions
-#$(filter %.cc,$(moc_OBJECTS)): %.cc: %.h
-#      echo $<; \
-#      /bin/mkdir -p .moc; \
-#      /usr/bin/moc  -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB 
-DQT_CORE_LIB $(srcdir)/$@ -o .moc/moc_$@
-
-$(moc_OBJECTS):;
-# extract the class name from the moc file name and passes <file>.h to the 
script to build .moc/moc_<file>.cc
+# 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_}; \
-       /usr/bin/moc  -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB 
-DQT_CORE_LIB $(srcdir)/$${f1/.cc/.h} -o $@
+       $(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