summaryrefslogtreecommitdiff
path: root/volk
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2010-12-08 01:29:58 -0500
committerTom Rondeau <trondeau@vt.edu>2010-12-08 01:29:58 -0500
commit74f206edb2c7bfbe010b5a5cbc5fe2f07965c3a6 (patch)
treea423281865307efbda15d0591fb800c7677e3cf6 /volk
parent81d722595385eb4b2ef09cb76db1d4070fc11324 (diff)
volk: Fixing makefiles for dist. Distcheck still failing on other issues now.
Diffstat (limited to 'volk')
-rw-r--r--volk/config/Makefile.am4
-rw-r--r--volk/include/volk/Makefile.am1
-rw-r--r--volk/lib/Makefile.am5
3 files changed, 4 insertions, 6 deletions
diff --git a/volk/config/Makefile.am b/volk/config/Makefile.am
index b7dc2c161f..0e556c6e20 100644
--- a/volk/config/Makefile.am
+++ b/volk/config/Makefile.am
@@ -29,7 +29,6 @@ m4macros = \
acx_pthread.m4 \
bnv_have_qt.m4 \
cppunit.m4 \
- gr_check_shm_open.m4 \
gr_lib64.m4 \
gr_libgnuradio_core_extra_ldflags.m4 \
gr_no_undefined.m4 \
@@ -37,15 +36,12 @@ m4macros = \
gr_pwin32.m4 \
gr_set_md_cpu.m4 \
lv_configure.m4 \
- gr_subversion.m4 \
gr_sysv_shm.m4 \
lf_cc.m4 \
lf_cxx.m4 \
lf_warnings.m4 \
- lv_lf_warnings.m4 \
lf_x11.m4 \
lv_set_simd_flags.m4 \
- lv_set_lv_arch.m4 \
mkstemp.m4 \
onceonly.m4 \
pkg.m4 \
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index 94c78ffff0..9894fdb997 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -30,6 +30,7 @@ volkinclude_HEADERS = \
volk_config.h \
volk_tables.h \
volk_typedefs.h \
+ volk_registry.h \
volk.h \
volk_cpu.h \
volk_environment_init.h \
diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am
index 97eb756807..54df42d54f 100644
--- a/volk/lib/Makefile.am
+++ b/volk/lib/Makefile.am
@@ -61,7 +61,7 @@ universal_CODE = \
volk_environment_init.c
generic_CODE = \
- volk_cpu_generic.cc
+ volk_cpu_generic.c
x86_CODE = \
volk_cpu_x86.c
@@ -73,7 +73,7 @@ x86_64_SUBCODE = \
cpuid_x86_64.S
powerpc_CODE = \
- volk_cpu_powerpc.cc
+ volk_cpu_powerpc.c
if MD_CPU_generic
@@ -236,6 +236,7 @@ libvolk_qa_la_LIBADD = \
noinst_HEADERS = \
volk_init.h \
qa_volk.h \
+ assembly.h \
qa_16s_quad_max_star_aligned16.h \
qa_32fc_dot_prod_aligned16.h \
qa_32fc_square_dist_aligned16.h \