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.
---
 grc/Makefile.am             | 6 +++---
 grc/freedesktop/Makefile.am | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'grc')

diff --git a/grc/Makefile.am b/grc/Makefile.am
index 2b5dc730b..330777bb7 100644
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2008,2009,2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -41,9 +41,9 @@ ourpython_PYTHON = __init__.py
 etcdir = $(gr_prefsdir)
 dist_etc_DATA = grc.conf
 
-EXTRA_DIST = $(srcdir)/grc.conf.in
+EXTRA_DIST += $(srcdir)/grc.conf.in
 
-BUILT_SOURCES = grc.conf
+BUILT_SOURCES += grc.conf
 
 grc.conf: $(srcdir)/grc.conf.in Makefile
 	sed \
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index f6aa97a93..dd7411bbb 100644
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -39,8 +39,8 @@ dist_pkglibexec_SCRIPTS = grc_setup_freedesktop
 grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile
 	sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@
 
-EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in
-BUILT_SOURCES = grc_setup_freedesktop
+EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in
+BUILT_SOURCES += grc_setup_freedesktop
 
 install-data-hook:
 	@printf "\n*** GRC Post-Install Message ***\
-- 
cgit