From d941ba31677804fe382d76fca17fc044d12777f5 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 26 Apr 2011 21:41:34 -0700
Subject: volk: removed cppunit from the build (not used anymore)

---
 volk/config/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'volk/config/Makefile.am')

diff --git a/volk/config/Makefile.am b/volk/config/Makefile.am
index 27e3f1296..e5b7281e6 100644
--- a/volk/config/Makefile.am
+++ b/volk/config/Makefile.am
@@ -30,7 +30,6 @@ m4macros = \
 	ax_boost_base.m4 \
 	ax_boost_unit_test_framework.m4 \
 	bnv_have_qt.m4 \
-	cppunit.m4 \
 	gr_lib64.m4 \
 	gr_libgnuradio_core_extra_ldflags.m4 \
 	gr_no_undefined.m4 \
-- 
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/config/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'volk/config/Makefile.am')

diff --git a/volk/config/Makefile.am b/volk/config/Makefile.am
index e5b7281e6..d4786f83a 100644
--- a/volk/config/Makefile.am
+++ b/volk/config/Makefile.am
@@ -42,7 +42,7 @@ m4macros = \
 	lf_cxx.m4 \
 	lf_warnings.m4 \
 	lf_x11.m4 \
-	lv_set_simd_flags.m4 \
+	$(top_gendir)/config/lv_set_simd_flags.m4 \
 	mkstemp.m4 \
 	onceonly.m4 \
 	pkg.m4 \
-- 
cgit