Revert "add the .i files as dependencies"

This reverts commit f43d2a4759e0ecd6519c0ac0aa4afbc54e70ea65.

The dependencies doesn't make any sense.  There's an attempt to run
sed on files that haven't been generated yet.

5 files changed, 1 insertions, 71 deletions

diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index be220425f..6d2ec1c7e 100644
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -387,17 +387,3 @@ gen_sources = $(BUILT_SOURCES)
 gen_sources_deps = $(core_generator)
 par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
 include $(top_srcdir)/Makefile.par.gen
-
-# Produce a list of the file names with the .cc stripped off
-files = $(foreach HFILE,$(libfilter_la_SOURCES), $(patsubst %.cc,%,$(HFILE)))
-
-# All .lo files depend on the .i file of the same name
-define template
--include $(DEPDIR)/$(1).d
-$(DEPDIR)/$(1).d:
-	@echo "$(1).lo: \\" > $(DEPDIR)/$(1).d
-	@cat ../swig/guile/gnuradio_core_filter.Std | sed -e '1d;' >> $(DEPDIR)/$(1).d
-endef
-
-# Generate all the dependencies at runtime
-$(foreach prog,$(files),$(eval $(call template,$(prog))))
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index 4a25df00a..3d8a42805 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -486,17 +486,3 @@ swiginclude_HEADERS =			\
 	gr_probe_mpsk_snr_c.i		\
 	gr_probe_density_b.i
 endif
-
-# Produce a list of the file names with the .cc stripped off
-files = $(foreach HFILE,$(libgeneral_la_SOURCES), $(patsubst %.cc,%,$(HFILE)))
-
-# All .lo files depend on the .i file of the same name
-define template
--include $(DEPDIR)/$(1).d
-$(DEPDIR)/$(1).d:
-	@echo "$(1).lo: \\" > $(DEPDIR)/$(1).d
-	@cat ../swig/guile/gnuradio_core_general.Std | sed -e '1d;' >> $(DEPDIR)/$(1).d
-endef
-
-# Generate all the dependencies at runtime
-$(foreach prog,$(files),$(eval $(call template,$(prog))))
diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am
index 83a4003af..4978ad1c5 100644
--- a/gnuradio-core/src/lib/gengen/Makefile.am
+++ b/gnuradio-core/src/lib/gengen/Makefile.am
@@ -159,17 +159,3 @@ gen_sources = $(BUILT_SOURCES)
 gen_sources_deps = $(core_generator)
 par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
 include $(top_srcdir)/Makefile.par.gen
-
-# Produce a list of the file names with the .cc stripped off
-files = $(foreach HFILE,$(libgengen_la_SOURCES), $(patsubst %.cc,%,$(HFILE)))
-
-# All .lo files depend on the .i file of the same name
-define template
--include $(DEPDIR)/$(1).d
-$(DEPDIR)/$(1).d:
-	@echo "$(1).lo: \\" > $(DEPDIR)/$(1).d
-	@cat ../swig/guile/gnuradio_core_gengen.Std | sed -e '1d;' >> $(DEPDIR)/$(1).d
-endef
-
-# Generate all the dependencies at runtime
-$(foreach prog,$(files),$(eval $(call template,$(prog))))
diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
index 86639c660..e2e7fe886 100644
--- a/gnuradio-core/src/lib/hier/Makefile.am
+++ b/gnuradio-core/src/lib/hier/Makefile.am
@@ -20,7 +20,7 @@
 # 
 
 include $(top_srcdir)/Makefile.common
-#-include $(top_builddir)/gnuradio-core/src/lib/swig/guile/gnuradio_core_hier.d
+
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
 
@@ -37,17 +37,3 @@ swiginclude_HEADERS = \
 	hier.i \
 	gr_channel_model.i
 endif
-
-# Produce a list of the file names with the .cc stripped off
-files = $(foreach HFILE,$(libhier_la_SOURCES), $(patsubst %.cc,%,$(HFILE)))
-
-# All .lo files depend on the .i file of the same name
-define template
--include $(DEPDIR)/$(1).d
-$(DEPDIR)/$(1).d:
-	@echo "$(1).lo: \\" > $(DEPDIR)/$(1).d
-	@cat ../swig/guile/gnuradio_core_hier.Std | sed -e '1d;' >> $(DEPDIR)/$(1).d
-endef
-
-# Generate all the dependencies at runtime
-$(foreach prog,$(files),$(eval $(call template,$(prog))))
diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am
index 0ab9ac135..c52554645 100644
--- a/gnuradio-core/src/lib/io/Makefile.am
+++ b/gnuradio-core/src/lib/io/Makefile.am
@@ -113,17 +113,3 @@ swiginclude_HEADERS =			\
 	gr_wavfile_source.i             \
 	gr_wavfile_sink.i
 endif
-
-# Produce a list of the file names with the .cc stripped off
-files = $(foreach HFILE,$(libio_la_SOURCES), $(patsubst %.cc,%,$(HFILE)))
-
-# All .lo files depend on the .i file of the same name
-define template
--include $(DEPDIR)/$(1).d
-$(DEPDIR)/$(1).d:
-	@echo "$(1).lo: \\" > $(DEPDIR)/$(1).d
-	@cat ../swig/guile/gnuradio_core_io.Std | sed -e '1d;' >> $(DEPDIR)/$(1).d
-endef
-
-# Generate all the dependencies at runtime
-$(foreach prog,$(files),$(eval $(call template,$(prog))))