[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7929 - in gnuradio/branches/developers/eb/reverted-78
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r7929 - in gnuradio/branches/developers/eb/reverted-7899: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib pmt/src/lib |
|
Date: |
Wed, 5 Mar 2008 07:07:13 -0700 (MST) |
Author: eb
Date: 2008-03-05 07:07:08 -0700 (Wed, 05 Mar 2008)
New Revision: 7929
Modified:
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/eb/reverted-7899/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/eb/reverted-7899/pmt/src/lib/Makefile.am
Log:
work-in-progress: still triggering generate_all when building from
dist tarball. Fails distcheck (distclean) with Makefile.gen's in
gr-trellis, gengen and filter.
Modified:
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/filter/Makefile.am
2008-03-05 02:16:08 UTC (rev 7928)
+++
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/filter/Makefile.am
2008-03-05 14:07:08 UTC (rev 7929)
@@ -62,7 +62,7 @@
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.
# http://sources.redhat.com/automake/automake.html#Multiple-Outputs
@@ -71,11 +71,10 @@
@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 +93,7 @@
fi
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
filter_generated.i generate-stamp
# ----------------------------------------------------------------
Modified:
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/gengen/Makefile.am
2008-03-05 02:16:08 UTC (rev 7928)
+++
gnuradio/branches/developers/eb/reverted-7899/gnuradio-core/src/lib/gengen/Makefile.am
2008-03-05 14:07:08 UTC (rev 7929)
@@ -111,7 +111,7 @@
gr_not_XX.h.t \
gr_not_XX.i.t
-include $(srcdir)/Makefile.gen
+include Makefile.gen
# Ensure parallel does the right thing.
# http://sources.redhat.com/automake/automake.html#Multiple-Outputs
@@ -120,11 +120,10 @@
@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,7 +142,7 @@
fi
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
gengen_generated.i generate-stamp
# ----------------------------------------------------------------
Modified:
gnuradio/branches/developers/eb/reverted-7899/gr-trellis/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/reverted-7899/gr-trellis/src/lib/Makefile.am
2008-03-05 02:16:08 UTC (rev 7928)
+++
gnuradio/branches/developers/eb/reverted-7899/gr-trellis/src/lib/Makefile.am
2008-03-05 14:07:08 UTC (rev 7929)
@@ -52,7 +52,7 @@
trellis_viterbi_X.h.t \
trellis_viterbi_X.i.t
-include $(srcdir)/Makefile.gen
+include Makefile.gen
# Ensure parallel does the right thing.
@@ -62,10 +62,9 @@
@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 +95,9 @@
$(GENERATED_H) \
$(GENERATED_I) \
$(GENERATED_CC) \
- $(swig_built_sources)
+ $(swig_built_sources) \
+ trellis_generated.i \
+ generate-stamp
ALL_IFILES = \
$(LOCAL_IFILES) \
Modified: gnuradio/branches/developers/eb/reverted-7899/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/reverted-7899/pmt/src/lib/Makefile.am
2008-03-05 02:16:08 UTC (rev 7928)
+++ gnuradio/branches/developers/eb/reverted-7899/pmt/src/lib/Makefile.am
2008-03-05 14:07:08 UTC (rev 7929)
@@ -78,7 +78,7 @@
pmt_serial_tags.h: $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm
$(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm
$(RUN_GUILE) $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm
$(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm pmt_serial_tags.h
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_CC) pmt_serial_tags.h
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_CC) pmt_serial_tags.h generate-stamp
# ----------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7929 - in gnuradio/branches/developers/eb/reverted-7899: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib pmt/src/lib,
eb <=