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 /gnuradio-core/src | |
| 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 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/filter/Makefile.am | 16 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/Makefile.am | 16 |
2 files changed, 18 insertions, 14 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 |