summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnuradio-core/src/lib/filter/Makefile.am16
-rw-r--r--gnuradio-core/src/lib/gengen/Makefile.am16
-rw-r--r--gr-trellis/src/lib/Makefile.am16
-rw-r--r--pmt/src/lib/Makefile.am10
4 files changed, 35 insertions, 23 deletions
diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 1b1a0c0a8..c08c8e39b 100644
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -62,20 +62,21 @@ CODE_GENERATOR = \
gr_freq_xlating_fir_filter_XXX.h.t \
gr_freq_xlating_fir_filter_XXX.i.t
-include $(srcdir)/Makefile.gen
+include Makefile.gen
-# Ensure parallel does the right thing.
+# Ensure parallel make does the right thing.
# http://sources.redhat.com/automake/automake.html#Multiple-Outputs
+STAMPS = generate-stamp
+
generate-stamp: $(CODE_GENERATOR)
@rm -f generate-tmp
@touch generate-tmp
PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
- touch $(srcdir)/Makefile.in
@mv -f generate-tmp $@
-$(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): generate-stamp
+$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) filter_generated.i: generate-stamp
## Recover from the removal of $@
@if test -f $@; then :; else \
trap 'rm -rf generate-lock generate-stamp' 1 2 13 15; \
@@ -94,7 +95,7 @@ $(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): generate-s
fi
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) filter_generated.i
# ----------------------------------------------------------------
@@ -180,7 +181,8 @@ EXTRA_libfilter_la_SOURCES = \
EXTRA_DIST = \
3dnow_float_dotprod_really_simple.S \
3dnow_float_dotprod_simple.S \
- $(CODE_GENERATOR)
+ $(CODE_GENERATOR) \
+ $(STAMPS)
# work around automake deficiency
@@ -315,4 +317,4 @@ swiginclude_HEADERS = \
$(GENERATED_I)
-CLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc
diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am
index a4330f103..8030e6c78 100644
--- a/gnuradio-core/src/lib/gengen/Makefile.am
+++ b/gnuradio-core/src/lib/gengen/Makefile.am
@@ -111,20 +111,21 @@ CODE_GENERATOR = \
gr_not_XX.h.t \
gr_not_XX.i.t
-include $(srcdir)/Makefile.gen
+include Makefile.gen
-# Ensure parallel does the right thing.
+# Ensure parallel make does the right thing.
# http://sources.redhat.com/automake/automake.html#Multiple-Outputs
+STAMPS = generate-stamp
+
generate-stamp: $(CODE_GENERATOR)
@rm -f generate-tmp
@touch generate-tmp
PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
- touch $(srcdir)/Makefile.in
@mv -f generate-tmp $@
-$(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): generate-stamp
+$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) gengen_generated.i : generate-stamp
## Recover from the removal of $@
@if test -f $@; then :; else \
trap 'rm -rf generate-lock generate-stamp' 1 2 13 15; \
@@ -143,12 +144,13 @@ $(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): generate-s
fi
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) gengen_generated.i
# ----------------------------------------------------------------
EXTRA_DIST = \
- $(CODE_GENERATOR)
+ $(CODE_GENERATOR) \
+ $(STAMPS)
libgengen_la_SOURCES = \
$(GENERATED_CC)
@@ -169,4 +171,4 @@ swiginclude_HEADERS = \
gengen.i \
gengen_generated.i
-CLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 62a8bc94b..55769b98f 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -52,20 +52,21 @@ CODE_GENERATOR = \
trellis_viterbi_X.h.t \
trellis_viterbi_X.i.t
-include $(srcdir)/Makefile.gen
+include Makefile.gen
-# Ensure parallel does the right thing.
+# Ensure parallel make does the right thing.
# http://sources.redhat.com/automake/automake.html#Multiple-Outputs
+STAMPS = generate-stamp
+
generate-stamp: $(CODE_GENERATOR)
@rm -f generate-tmp
@touch generate-tmp
PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
- touch $(srcdir)/Makefile.in
@mv -f generate-tmp $@
-$(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): generate-stamp
+$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) trellis_generated.i : generate-stamp
## Recover from the removal of $@
@if test -f $@; then :; else \
trap 'rm -rf generate-lock generate-stamp' 1 2 13 15; \
@@ -96,7 +97,8 @@ BUILT_SOURCES = \
$(GENERATED_H) \
$(GENERATED_I) \
$(GENERATED_CC) \
- $(swig_built_sources)
+ $(swig_built_sources) \
+ trellis_generated.i
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -109,7 +111,9 @@ LOCAL_IFILES = \
$(top_srcdir)/gr-trellis/src/lib/trellis.i
EXTRA_DIST = \
- $(CODE_GENERATOR)
+ $(CODE_GENERATOR) \
+ $(STAMPS)
+
# This gets trellis.py installed in the right place
ourpython_PYTHON = \
diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am
index 16834746d..d615836e8 100644
--- a/pmt/src/lib/Makefile.am
+++ b/pmt/src/lib/Makefile.am
@@ -47,9 +47,11 @@ GENERATED_CC = \
-# Ensure parallel does the right thing.
+# Ensure parallel make does the right thing.
# http://sources.redhat.com/automake/automake.html#Multiple-Outputs
+STAMPS = generate-stamp
+
generate-stamp: $(CODE_GENERATOR)
@rm -f generate-tmp
@touch generate-tmp
@@ -83,7 +85,9 @@ BUILT_SOURCES = $(GENERATED_H) $(GENERATED_CC) pmt_serial_tags.h
# ----------------------------------------------------------------
EXTRA_DIST = \
- $(CODE_GENERATOR)
+ $(CODE_GENERATOR) \
+ $(STAMPS)
+
# These are the source files that go into the pmt shared library
libpmt_la_SOURCES = \
@@ -140,4 +144,4 @@ test_pmt_SOURCES = test_pmt.cc
test_pmt_LDADD = $(LIBPMTQA)
-CLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc