summaryrefslogtreecommitdiff
path: root/usrp/host/swig
diff options
context:
space:
mode:
authorEric Blossom2010-11-24 17:29:11 -0800
committerEric Blossom2010-11-24 17:29:11 -0800
commitd692a41f98e7b888c745efbb9fcbbb0400f39025 (patch)
tree591782e695d1d29f2dfcfe6390fc21cd99a06a16 /usrp/host/swig
parent42fe3e571be14e70cb06ea1244125553f0606be4 (diff)
downloadgnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.tar.gz
gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.tar.bz2
gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.zip
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.
Diffstat (limited to 'usrp/host/swig')
-rw-r--r--usrp/host/swig/Makefile.am9
1 files changed, 1 insertions, 8 deletions
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index c846f267b..5baeff4cb 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -20,6 +20,7 @@
#
include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
AM_CPPFLAGS = \
$(USRP_INCLUDES) \
@@ -53,11 +54,3 @@ usrp_prims_la_swig_libadd = \
usrp_prims_python = \
__init__.py \
usrp_fpga_regs.py
-
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)