[Commit-gnuradio] r7887 - in gnuradio/branches/developers/michaelld/distcheck_fix: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib

[michaelld]

Author: michaelld
Date: 2008-02-28 20:27:39 -0700 (Thu, 28 Feb 2008)
New Revision: 7887

Modified:
   
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/filter/Makefile.am
   
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/gengen/Makefile.am
   
gnuradio/branches/developers/michaelld/distcheck_fix/gr-trellis/src/lib/Makefile.am
Log:
This time it does really work ;)



Modified: 
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/filter/Makefile.am
       2008-02-29 03:25:51 UTC (rev 7886)
+++ 
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/filter/Makefile.am
       2008-02-29 03:27:39 UTC (rev 7887)
@@ -62,15 +62,12 @@
        gr_freq_xlating_fir_filter_XXX.h.t              \
        gr_freq_xlating_fir_filter_XXX.i.t
 
+include $(srcdir)/Makefile.gen
 
-
-include Makefile.gen
-
-
-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/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/gengen/Makefile.am
       2008-02-29 03:25:51 UTC (rev 7886)
+++ 
gnuradio/branches/developers/michaelld/distcheck_fix/gnuradio-core/src/lib/gengen/Makefile.am
       2008-02-29 03:27:39 UTC (rev 7887)
@@ -111,12 +111,12 @@
        gr_not_XX.h.t                   \
        gr_not_XX.i.t
 
-include Makefile.gen
+include $(srcdir)/Makefile.gen
 
-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/branches/developers/michaelld/distcheck_fix/gr-trellis/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/distcheck_fix/gr-trellis/src/lib/Makefile.am
 2008-02-29 03:25:51 UTC (rev 7886)
+++ 
gnuradio/branches/developers/michaelld/distcheck_fix/gr-trellis/src/lib/Makefile.am
 2008-02-29 03:27:39 UTC (rev 7887)
@@ -52,11 +52,12 @@
        trellis_viterbi_X.h.t                   \
        trellis_viterbi_X.i.t
 
-include Makefile.gen
+include $(srcdir)/Makefile.gen
 
-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