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.common | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index a09b9fbdb..c683a9f9b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -40,7 +40,6 @@ swigincludedir = $(grincludedir)/swig
 guiledir = $(prefix)/share/guile/site
 grguiledir = $(guiledir)/gnuradio
 
-if PYTHON
 # Install the gnuradio stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -54,7 +53,6 @@ grpyexecdir = $(pyexecdir)/gnuradio
 
 usrppythondir = $(pythondir)/usrpm
 usrppyexecdir = $(pyexecdir)/usrpm
-endif
 
 # gcell includes
 gcellincludedir = $(includedir)/gcell
@@ -125,7 +123,6 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
 ## SWIG suffixes for automake to know about
 SUFFIXES = .i .scm .py
 
-if GUILE
 # Compile a .i to what guile needs. We use -o to set the output file name,
 # or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a 
 # gnuradio_core_*_wrap.cxx in the source directory.
@@ -140,7 +137,6 @@ gnuradio/%.scm : %.i
 	$(SED) -i -e 's/<--dummy-[0-9]\+-->/<top>/g' gnuradio/$*.scm
 	$(SED) -i -e 's/^(export /(export-safely /' gnuradio/$*.scm
 	$(RM) guile/$*.Std
-endif
 
 # Compile a .i file to what python needs
 .i.py:
@@ -153,7 +149,7 @@ endif
 	$(RM) python/$*.Std
 
 # Don't distribute the files defined in the variable 'no_dist_files'
-no_dist_dirs = python gnuradio guile
+# or the directories listed in no_dist_dirs (set in Makefile.swig)
 dist-hook:
 	@for dir in $(no_dist_dirs); do \
 		echo $(RM) -fr $(distdir)/$$dir; \
-- 
cgit