[Commit-gnuradio] r7931 - in gnuradio/trunk: gnuradio-core/src/lib/filte

commit-gnuradio

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r7931 - in gnuradio/trunk: gnuradio-core/src/lib/filte

From:	eb
Subject:	[Commit-gnuradio] r7931 - in gnuradio/trunk: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib pmt/src/lib
Date:	Wed, 5 Mar 2008 08:40:45 -0700 (MST)

Author: eb
Date: 2008-03-05 08:40:44 -0700 (Wed, 05 Mar 2008)
New Revision: 7931

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
   gnuradio/trunk/gr-trellis/src/lib/Makefile.am
   gnuradio/trunk/pmt/src/lib/Makefile.am
Log:
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".


Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2008-03-05 
15:33:11 UTC (rev 7930)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2008-03-05 
15:40:44 UTC (rev 7931)
@@ -62,20 +62,21 @@
        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 @@
              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_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 @@
        $(GENERATED_I)
 
 
-CLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc

Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2008-03-05 
15:33:11 UTC (rev 7930)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2008-03-05 
15:40:44 UTC (rev 7931)
@@ -111,20 +111,21 @@
        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 @@
              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 @@
        gengen.i                        \
        gengen_generated.i              
 
-CLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc

Modified: gnuradio/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am       2008-03-05 15:33:11 UTC 
(rev 7930)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am       2008-03-05 15:40:44 UTC 
(rev 7931)
@@ -52,20 +52,21 @@
        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 @@
        $(GENERATED_H)          \
        $(GENERATED_I)          \
        $(GENERATED_CC)         \
-       $(swig_built_sources)
+       $(swig_built_sources)   \
+       trellis_generated.i     
 
 ALL_IFILES =                   \
        $(LOCAL_IFILES)         \
@@ -109,8 +111,10 @@
        $(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 =             \
        trellis.py

Modified: gnuradio/trunk/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/pmt/src/lib/Makefile.am      2008-03-05 15:33:11 UTC (rev 
7930)
+++ gnuradio/trunk/pmt/src/lib/Makefile.am      2008-03-05 15:40:44 UTC (rev 
7931)
@@ -47,9 +47,11 @@
 
 
 
-# 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,8 +85,10 @@
 # ----------------------------------------------------------------
 
 EXTRA_DIST =                           \
-       $(CODE_GENERATOR)               
+       $(CODE_GENERATOR)               \
+       $(STAMPS)
 
+
 # These are the source files that go into the pmt shared library
 libpmt_la_SOURCES =                    \
        pmt.cc                          \
@@ -140,4 +144,4 @@
 test_pmt_LDADD   = $(LIBPMTQA)
 
 
-CLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc

[Prev in Thread]

Current Thread

[Next in Thread]

[Commit-gnuradio] r7931 - in gnuradio/trunk: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib pmt/src/lib, eb <=

Prev by Date: [Commit-gnuradio] r7930 - in gnuradio/branches/developers/eb/reverted-7899: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib pmt/src/lib
Next by Date: [Commit-gnuradio] r7932 - gnuradio/branches/developers/eb
Previous by thread: [Commit-gnuradio] r7930 - in gnuradio/branches/developers/eb/reverted-7899: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib pmt/src/lib
Next by thread: [Commit-gnuradio] r7932 - gnuradio/branches/developers/eb
Index(es):
- Date
- Thread