[Commit-gnuradio] r7899 - in gnuradio/trunk: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib

[jcorgan]

Author: jcorgan
Date: 2008-02-29 10:40:18 -0700 (Fri, 29 Feb 2008)
New Revision: 7899

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
Log:
Merged r7866:7887 from michaelld/discheck_fix into trunk.  Allows running 'make 
distcheck' without running 'make' first.

Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2008-02-29 
15:28:29 UTC (rev 7898)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2008-02-29 
17:40:18 UTC (rev 7899)
@@ -62,16 +62,12 @@
        gr_freq_xlating_fir_filter_XXX.h.t              \
        gr_freq_xlating_fir_filter_XXX.i.t
 
+include $(srcdir)/Makefile.gen
 
-
-# include $(srcdir)/Makefile.gen
-include Makefile.gen
-
-
-$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
+$(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): 
$(CODE_GENERATOR)
        PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) 
$(PYTHON) $(srcdir)/generate_all.py
+       touch $(srcdir)/Makefile.in
 
-
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
 
 

Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2008-02-29 
15:28:29 UTC (rev 7898)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2008-02-29 
17:40:18 UTC (rev 7899)
@@ -111,14 +111,12 @@
        gr_not_XX.h.t                   \
        gr_not_XX.i.t
 
-# include $(srcdir)/Makefile.gen
-include Makefile.gen
+include $(srcdir)/Makefile.gen
 
-
-$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
+$(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): 
$(CODE_GENERATOR)
        PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) 
$(PYTHON) $(srcdir)/generate_all.py
+       touch $(srcdir)/Makefile.in
 
-
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
 
 # ----------------------------------------------------------------

Modified: gnuradio/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am       2008-02-29 15:28:29 UTC 
(rev 7898)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am       2008-02-29 17:40:18 UTC 
(rev 7899)
@@ -52,11 +52,12 @@
        trellis_viterbi_X.h.t                   \
        trellis_viterbi_X.i.t
 
-include Makefile.gen
+include $(srcdir)/Makefile.gen
 
-$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
+$(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): 
$(CODE_GENERATOR)
        PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python \
                srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
+       touch $(srcdir)/Makefile.in
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _trellis shared library