From de771b0303298e7761f3c5350323565d05c5ee6d Mon Sep 17 00:00:00 2001
From: Nick Foster
Date: Mon, 18 Apr 2011 10:11:57 -0700
Subject: Volk: remove some dead files from Makefile.am

---
 volk/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'volk/Makefile.am')

diff --git a/volk/Makefile.am b/volk/Makefile.am
index 03c5aac35..cf55c76fa 100644
--- a/volk/Makefile.am
+++ b/volk/Makefile.am
@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I config
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = bootstrap configure config.h.in volk_config.h
+EXTRA_DIST = bootstrap configure config.h.in
 SUBDIRS = config
 if LV_HAVE_ORC
 SUBDIRS += orc
-- 
cgit 


From a5e2d9e5baf869ae961fbb5820447290d6d9c7c8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 26 Apr 2011 21:55:48 -0700
Subject: volk: reorganization of generation sources and generated files

All generation sources have been moved to the gen/ subdirectory.
Bootstrap and volk_register.py generate the files into to gen/ subdirectory
in an effort to cleanly separate the static/generated parts of the build tree.

Define top_gendir in Makefile.common, all generated sources listed in Makefile.ams
are prefixed with $(top_gendir) to differentiate them from static in-tree sources.
---
 volk/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'volk/Makefile.am')

diff --git a/volk/Makefile.am b/volk/Makefile.am
index cf55c76fa..829c37b78 100644
--- a/volk/Makefile.am
+++ b/volk/Makefile.am
@@ -38,7 +38,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = volk.pc
 
 distclean-local:
-	-rm -f config/lv_set_simd_flags.m4
 	-rm -rf autom4te.cache
 	-rm -f config.*
 	-rm -f depcomp
@@ -61,3 +60,6 @@ distclean-local:
 	-rm -f configure
 	-rm -f orc/Makefile.in
 	-rm -f orc/*.c
+	-rm -rf gen/config
+	-rm -rf gen/include
+	-rm -rf gen/lib
-- 
cgit