From 63d05d64826fd1b3eef89e5a8a14a73b318464ac Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Mon, 26 Feb 2007 21:26:10 +0000
Subject: Merged r4632:4645 on jcorgan/linking into trunk.  Cleans up linking
 issues with libtool and already installed libraries.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4646 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-qtgui/src/lib/Makefile.am | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'gr-qtgui/src/lib')

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 2f98dd5d0..8adcd591b 100644
--- 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)
-- 
cgit