Merged r4632:4645 on jcorgan/linking into trunk. Cleans up linking issues with libto...

[debian/gnuradio] / gr-qtgui / src / lib / Makefile.am

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 2f98dd5d0f86dba1d5b997619c7dbfd474a074b1..8adcd591bf1d054f071cb5d65e8dc05bb3d965d8 100644 (file)
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -43,18 +43,23 @@ include_HEADERS =
 noinst_PROGRAMS =                      \
        qt_examples     
 
-qt_examples_MOC =                      \
+BUILT_SOURCES =                        \
        moc_fftdisplay.cc
 
+nodist_qt_examples_SOURCES =           \
+       $(BUILT_SOURCES)
+       
 qt_examples_SOURCES =                  \
        fftdisplay.cc                   \
-       qt_examples.cc                  \
-       $(qt_examples_MOC)
+       qt_examples.cc
 
-qt_examples_LDADD = $(QWT_LIBS) $(QT_LIBS)
-qt_examples_LDFLAGS = $(QT_CFLAGS) $(QWT_CFLAGS) $(GNURADIO_CORE_LIBS)
+qt_examples_LDADD = $(QWT_LIBS)        \
+                   $(QT_LIBS)          \
+                   $(GNURADIO_CORE_LA)
 
-MOSTLYCLEANFILES =                     \
-       *~
 
-CLEANFILES = $(filter moc_%.cc, $(qt_examples_SOURCES))                
+qt_examples_LDFLAGS = $(QT_CFLAGS)     \
+                     $(QWT_CFLAGS)
+
+MOSTLYCLEANFILES =                     \
+       *~ $(BUILT_SOURCES)