From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 29 Feb 2008 17:40:18 +0000 (+0000)
Subject: Merged r7866:7887 from michaelld/discheck_fix into trunk.  Allows running 'make distc... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a3ef00c5659120e2f6bb6f17d644d47b9a8bf7be;p=debian%2Fgnuradio

Merged r7866:7887 from michaelld/discheck_fix into trunk.  Allows running 'make distcheck' without running 'make' first.

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 709ad603..ca583851 100644
--- 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 6d9a716a..b1a3b261 100644
--- 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 d18fad8d..9eeb3e04 100644
--- 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