From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom <eb@comsec.com>
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.
---
gnuradio-core/src/gen_interpolator_taps/Makefile.am | 8 +++++++-
gnuradio-core/src/guile/Makefile.am | 4 +---
gnuradio-core/src/lib/filter/Makefile.am | 4 ++--
gnuradio-core/src/lib/g72x/Makefile.am | 2 +-
gnuradio-core/src/lib/general/Makefile.am | 2 +-
gnuradio-core/src/lib/gengen/Makefile.am | 4 ++--
gnuradio-core/src/lib/missing/Makefile.am | 2 +-
gnuradio-core/src/lib/reed-solomon/Makefile.am | 2 +-
gnuradio-core/src/lib/swig/Makefile.am | 12 +++++-------
gnuradio-core/src/python/bin/Makefile.am | 4 ++--
gnuradio-core/src/python/gnuradio/gr/Makefile.am | 2 +-
gnuradio-core/src/tests/Makefile.am | 4 ++--
gnuradio-core/src/utils/Makefile.am | 2 +-
13 files changed, 27 insertions(+), 25 deletions(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/gen_interpolator_taps/Makefile.am b/gnuradio-core/src/gen_interpolator_taps/Makefile.am
index d244e7f546..1b54af5e72 100644
--- a/gnuradio-core/src/gen_interpolator_taps/Makefile.am
+++ b/gnuradio-core/src/gen_interpolator_taps/Makefile.am
@@ -21,7 +21,13 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = praxis.txt simpson.h objective_fct.c gen_interpolator_taps.c simpson.c praxis.f
+EXTRA_DIST += \
+ praxis.txt \
+ simpson.h \
+ objective_fct.c \
+ gen_interpolator_taps.c \
+ simpson.c \
+ praxis.f
# if ENABLE_FORTRAN
# noinst_PROGRAMS = gen_interpolator_taps
diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am
index c2f8b5c391..209e664a0f 100644
--- a/gnuradio-core/src/guile/Makefile.am
+++ b/gnuradio-core/src/guile/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common
TESTS = run_guile_tests
-EXTRA_DIST = \
+EXTRA_DIST += \
run_guile_tests.in \
$(nobase_guile_DATA) \
$(GUILE_TESTS)
@@ -52,5 +52,3 @@ GUILE_TESTS = \
tests/io_ctors.test
CLEANFILES = guile.log
-
-no_dist_dirs = python guile
diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 6d2ec1c7e6..38edee3d56 100644
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -67,7 +67,7 @@ code_generator = \
# Source built by Python into $(builddir)
-BUILT_SOURCES = \
+BUILT_SOURCES += \
$(GENERATED_H) \
$(GENERATED_I) \
$(GENERATED_CC) \
@@ -178,7 +178,7 @@ EXTRA_libfilter_la_SOURCES = \
$(armv7_a_qa_CODE)
-EXTRA_DIST = \
+EXTRA_DIST += \
3dnow_float_dotprod_really_simple.S \
3dnow_float_dotprod_simple.S \
$(code_generator)
diff --git a/gnuradio-core/src/lib/g72x/Makefile.am b/gnuradio-core/src/lib/g72x/Makefile.am
index 6c41f1911a..d2700376fe 100644
--- a/gnuradio-core/src/lib/g72x/Makefile.am
+++ b/gnuradio-core/src/lib/g72x/Makefile.am
@@ -24,4 +24,4 @@ include $(top_srcdir)/Makefile.common
noinst_LTLIBRARIES = libccitt.la
libccitt_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h
-EXTRA_DIST = encode.c decode.c
+EXTRA_DIST += encode.c decode.c
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index 7357957897..b25326debe 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -29,7 +29,7 @@ BUILT_SOURCES =
# ----------------------------------------------------------------
-EXTRA_DIST = \
+EXTRA_DIST += \
gen_sine_table.py \
gr_constants.cc.in
diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am
index 4978ad1c51..cfa043b677 100644
--- a/gnuradio-core/src/lib/gengen/Makefile.am
+++ b/gnuradio-core/src/lib/gengen/Makefile.am
@@ -115,7 +115,7 @@ core_generator = \
gr_moving_average_XX.i.t
# Source built by Python into $(builddir)
-BUILT_SOURCES = \
+BUILT_SOURCES += \
$(GENERATED_H) \
$(GENERATED_I) \
$(GENERATED_CC) \
@@ -123,7 +123,7 @@ BUILT_SOURCES = \
# ----------------------------------------------------------------
-EXTRA_DIST = \
+EXTRA_DIST += \
$(core_generator)
libgengen_la_SOURCES = \
diff --git a/gnuradio-core/src/lib/missing/Makefile.am b/gnuradio-core/src/lib/missing/Makefile.am
index 2383709101..bd18cf1434 100644
--- a/gnuradio-core/src/lib/missing/Makefile.am
+++ b/gnuradio-core/src/lib/missing/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = $(GNURADIO_INCLUDES) $(WITH_INCLUDES)
-EXTRA_DIST = \
+EXTRA_DIST += \
getopt.h \
getopt.c \
gettimeofday.c \
diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.am b/gnuradio-core/src/lib/reed-solomon/Makefile.am
index b7bd939b0c..5548f4280a 100644
--- a/gnuradio-core/src/lib/reed-solomon/Makefile.am
+++ b/gnuradio-core/src/lib/reed-solomon/Makefile.am
@@ -29,7 +29,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
TESTS = rstest
-EXTRA_DIST = \
+EXTRA_DIST += \
README.karn
noinst_LTLIBRARIES = librs.la
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index a97bb6ea00..f8e7640ae1 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -22,7 +22,8 @@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.swig
-BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources)
+AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+ $(WITH_INCLUDES)
# ----------------------------------------------------------------
# We've split the previously monstrous gnuradio_core into 6
@@ -52,11 +53,6 @@ nobase_swiginclude_HEADERS = \
guile/std_vector.i
-AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
- $(WITH_INCLUDES)
-
-EXTRA_DIST = gen-swig-bug-fix
-
# special install for this top-level Python script which includes all
# of the split Python libraries.
ourpythondir = $(grpythondir)/gr
@@ -67,9 +63,12 @@ ourpython_PYTHON = gnuradio_core.py
# gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix
# $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@
+EXTRA_DIST += gen-swig-bug-fix
+
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = gnuradio_swig_bug_workaround.h
+
# Install so that they end up available as:
# import gnuradio.gr
# This ends up at:
@@ -89,5 +88,4 @@ gnuradio_core_filter_la_swig_libadd = $(GNURADIO_CORE_LA)
gnuradio_core_io_la_swig_libadd = $(GNURADIO_CORE_LA)
gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA)
-
SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE
diff --git a/gnuradio-core/src/python/bin/Makefile.am b/gnuradio-core/src/python/bin/Makefile.am
index 0afd327676..6f9f162f1d 100644
--- a/gnuradio-core/src/python/bin/Makefile.am
+++ b/gnuradio-core/src/python/bin/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2009 Free Software Foundation, Inc.
+# Copyright 2005,2009,2010 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,7 +22,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = microtune.py
+EXTRA_DIST += microtune.py
noinst_SCRIPTS = \
microtune.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
index 7d89777eff..b8da9cf487 100644
--- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+EXTRA_DIST += \
run_tests.in \
test_16bit_1chunk.wav
diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am
index 2bf7cb4e54..c75bb8c2a4 100644
--- a/gnuradio-core/src/tests/Makefile.am
+++ b/gnuradio-core/src/tests/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2008 Free Software Foundation, Inc.
+# Copyright 2001,2008,2010 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -31,7 +31,7 @@ TESTS = test_all
# test_atsc
#Test program to test setting up buffers using gr_test which can be run manually
-EXTRA_DIST = \
+EXTRA_DIST += \
test_buffers.py \
benchmark_dotprod
diff --git a/gnuradio-core/src/utils/Makefile.am b/gnuradio-core/src/utils/Makefile.am
index 22dae7117b..acf4391400 100644
--- a/gnuradio-core/src/utils/Makefile.am
+++ b/gnuradio-core/src/utils/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+EXTRA_DIST += \
cic_comp_taps.m \
db_width.m \
filter_tools.m \
--
cgit v1.2.3