diff options
| author | eb | 2008-03-05 15:40:44 +0000 |
|---|---|---|
| committer | eb | 2008-03-05 15:40:44 +0000 |
| commit | 4f2f87e7b2fa3e6bd21726040ec01be521b258b3 (patch) | |
| tree | fc6a03234b3eb00164737d3192844685f91c6e3a /gr-trellis/src/lib/Makefile.am | |
| parent | 787c17cfed1d89d6219a2dd36029d3da8025c726 (diff) | |
| download | gnuradio-4f2f87e7b2fa3e6bd21726040ec01be521b258b3.tar.gz gnuradio-4f2f87e7b2fa3e6bd21726040ec01be521b258b3.tar.bz2 gnuradio-4f2f87e7b2fa3e6bd21726040ec01be521b258b3.zip | |
Merged eb/reverted-7899 -r7928:7930 into trunk. This effectively
reverts changeset 7899 and fixes some distcheck problems. We're now
back to the old behavior, where you must "make" before "make distcheck".
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7931 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib/Makefile.am')
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 16 |
1 files changed, 10 insertions, 6 deletions
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 = \ |