Merged r7866:7887 from michaelld/discheck_fix into trunk. Allows running 'make distc...

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7899 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 709ad603e0c57cd10a2fdbe7cb3ab725ce41f33d..ca5838510288f527de929632ae335a1c13f84381 100644 (file)
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -62,15 +62,11 @@ CODE_GENERATOR =                                    \
        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)
 

diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am
index 6d9a716a637b5c156bd899b3ed6e9e5dc77af8e2..b1a3b261314bbb02ad99e037e9dcf463fa254097 100644 (file)
--- a/gnuradio-core/src/lib/gengen/Makefile.am
+++ b/gnuradio-core/src/lib/gengen/Makefile.am
@@ -111,13 +111,11 @@ CODE_GENERATOR =                  \
        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)
 

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index d18fad8dba0ea8730b73927c92ff38cf9b17c6d4..9eeb3e043d6faf93b1a2b91490aa2e7078474292 100644 (file)
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -52,11 +52,12 @@ CODE_GENERATOR =                            \
        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