From f43d2a4759e0ecd6519c0ac0aa4afbc54e70ea65 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Wed, 10 Nov 2010 17:57:11 -0700
Subject: add the .i files as dependencies

---
 gnuradio-core/src/lib/hier/Makefile.am | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'gnuradio-core/src/lib/hier/Makefile.am')

diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
index e2e7fe886..86639c660 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,3 +37,17 @@ 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))))
-- 
cgit 


From 5783b693279b6c64ef800f6e8294ec68a2869b29 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 10 Nov 2010 18:21:50 -0800
Subject: 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.
---
 gnuradio-core/src/lib/hier/Makefile.am | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'gnuradio-core/src/lib/hier/Makefile.am')

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))))
-- 
cgit 


From 9911a8d9edcde54b9a18810f37799a58a6895310 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 7 Dec 2010 13:35:54 -0800
Subject: Remove incorrect if PYTHON around swiginclude_HEADERS

---
 gnuradio-core/src/lib/hier/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gnuradio-core/src/lib/hier/Makefile.am')

diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
index e2e7fe886..b525d19b4 100644
--- a/gnuradio-core/src/lib/hier/Makefile.am
+++ b/gnuradio-core/src/lib/hier/Makefile.am
@@ -32,8 +32,6 @@ libhier_la_SOURCES = \
 grinclude_HEADERS = \
 	gr_channel_model.h
 
-if PYTHON
 swiginclude_HEADERS = \
 	hier.i \
 	gr_channel_model.i
-endif
-- 
cgit