From e4eb47f0dd55485693e70ec2f45f79912fa899c4 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 21 Nov 2010 19:43:39 -0800
Subject: Clean up lib/swig/Makefile.am, Makefile.common and Makefile.swig

Confirmed that it builds and make checks on all four combintations
of --{enable,disable}-{python,guile}.

Have not tested make dist, but expect that there may be some problems
with it.  I'm pretty sure that not all files that need to be removed
from the distribution are removed, and make clean may still be leaving
some files around.
---
 Makefile.swig | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Makefile.swig')

diff --git a/Makefile.swig b/Makefile.swig
index 03b7c92a3..c6b36ddef 100644
--- a/Makefile.swig
+++ b/Makefile.swig
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,6 +25,9 @@
 ## in Makefile.am's which require SWIG wrapping / compilation.
 ## For just installing .i files, this Makefile is not required.
 
+CLEANFILES = python/*.cc python/*.h python/*.lo python/*.o
+CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.lo guile/*.o
+
 ## swig flags
 ## -w511 turns off keyword argument warning
 ## "-outdir $(builddir)" writes all generated output files to
@@ -32,9 +35,6 @@
 ##   In some older autotools, $(builddir) is not defined, so
 ##   just use '.' instead.
 
-CLEANFILES = python/*.cc python/*.h python/*.lo python/*.o
-CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.lo guile/*.o
-
 SWIG_PYTHON_FLAGS =	\
 	-fvirtual	\
 	-python		\
@@ -144,3 +144,6 @@ if GUILE
 GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE)))
 swig_built_sources += $(GUILE_GEN)
 endif
+
+no_dist_dirs = python gnuradio guile
+no_dist_files = $(swig_built_sources)
-- 
cgit