From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: Major Makefile.am housecleaning.  Passes distcheck.

Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
---
 gr-qtgui/src/lib/Makefile.am    | 24 +++++++-----------------
 gr-qtgui/src/python/Makefile.am |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'gr-qtgui')

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1ee3c8e3d..b45b25c9d 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -20,6 +20,9 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+EXTRA_DIST += spectrumdisplayform.ui
 
 AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
               $(QT_INCLUDES) $(WITH_INCLUDES)
@@ -34,9 +37,7 @@ QMAKE_SOURCES = 				\
 	ConstellationDisplayPlot.moc.cc		\
 	spectrumdisplayform.ui.h
 
-EXTRA_DIST = spectrumdisplayform.ui
-
-BUILT_SOURCES = $(QMAKE_SOURCES)
+BUILT_SOURCES += $(QMAKE_SOURCES)
 
 # Build the normal library for C++ apps to link against
 lib_LTLIBRARIES = libgnuradio-qtgui.la
@@ -55,7 +56,7 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	qtgui_sink_c.cc				\
 	qtgui_sink_f.cc
 
-nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES)
+nodist_libgnuradio_qtgui_la_SOURCES=$(QMAKE_SOURCES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
@@ -88,9 +89,9 @@ libgnuradio_qtgui_la_LIBADD = 		\
 	-lstdc++		\
 	$(QT_LIBS)
 
-if PYTHON
+
 ##############################
-# SWIG interface and library
+# SWIG interfaces and libraries
 
 TOP_SWIG_IFILES = 		\
 	qtgui.i
@@ -105,14 +106,3 @@ qtgui_pythondir_category =	\
 # additional libraries for linking with the SWIG-generated library
 qtgui_la_swig_libadd =		\
 	libgnuradio-qtgui.la
-
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES += 		\
-	$(swig_built_sources)
-endif
-
-# Do not distribute built sources, they may contain generated paths
-# which are invalid on other systems
-no_dist_files = $(BUILT_SOURCES)
diff --git a/gr-qtgui/src/python/Makefile.am b/gr-qtgui/src/python/Makefile.am
index 5544748df..31df63a44 100644
--- a/gr-qtgui/src/python/Makefile.am
+++ b/gr-qtgui/src/python/Makefile.am
@@ -29,7 +29,7 @@ noinst_PYTHON = 		\
 	usrp2_display.py	\
 	usrp_display.py
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	qt_digital_window.ui
 
 qtguipythondir = $(grpythondir)/qtgui
-- 
cgit