diff options
| -rw-r--r-- | volk/Makefile.am | 2 | ||||
| -rw-r--r-- | volk/configure.ac | 2 | ||||
| -rw-r--r-- | volk/include/volk/make_set_simd.py | 1 | ||||
| -rw-r--r-- | volk/lib/Makefile.am | 1 | ||||
| -rwxr-xr-x | volk/system_cleanup.sh | 10 |
5 files changed, 9 insertions, 7 deletions
diff --git a/volk/Makefile.am b/volk/Makefile.am index d2ef3dad4..19725e8ab 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 +EXTRA_DIST = bootstrap configure config.h.in volk_config.h system_cleanup.sh SUBDIRS = config include lib #if USE_PYTHON #SUBDIRS += python diff --git a/volk/configure.ac b/volk/configure.ac index 4c095cbd5..96d4f4de7 100644 --- a/volk/configure.ac +++ b/volk/configure.ac @@ -72,6 +72,6 @@ AC_CONFIG_FILES([\ volk.pc \ ]) -AC_CONFIG_COMMANDS([run_system_cleanup], [chmod +x system_cleanup.sh && ./system_cleanup.sh $MYCPU $MYSUBCPU], [MYCPU=$MD_CPU MYSUBCPU=$MD_SUBCPU]) +AC_CONFIG_COMMANDS([run_system_cleanup], [chmod +x $srcdir/system_cleanup.sh && $srcdir/system_cleanup.sh $MYCPU $MYSUBCPU $srcdir], [MYCPU=$MD_CPU MYSUBCPU=$MD_SUBCPU]) AC_OUTPUT diff --git a/volk/include/volk/make_set_simd.py b/volk/include/volk/make_set_simd.py index e320bc748..c35aa06fa 100644 --- a/volk/include/volk/make_set_simd.py +++ b/volk/include/volk/make_set_simd.py @@ -98,7 +98,6 @@ def make_set_simd(dom) : tempstring = tempstring + " cf_with_lv_arch=$lv_PROCCPU\n"; tempstring = tempstring + " fi\n"; - tempstring = tempstring + " echo $cf_with_lv_arch\n"; for domarch in dom: if str(domarch.attributes["type"].value) != "all": arch = str(domarch.attributes["name"].value); diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 54df42d54..4ee934e8b 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -46,6 +46,7 @@ lib_LTLIBRARIES = \ libvolk_runtime.la \ libvolk_qa.la +EXTRA_DIST = volk_mktables.c # ---------------------------------------------------------------- # The main library diff --git a/volk/system_cleanup.sh b/volk/system_cleanup.sh index 7ebd2caf8..5be9494f4 100755 --- a/volk/system_cleanup.sh +++ b/volk/system_cleanup.sh @@ -2,26 +2,28 @@ cp volk_config.h include/volk/ cd lib +srcdir=../$3 + case $1 in (x86) case $2 in (x86_64) - gcc -o volk_mktables -I../include -I. volk_cpu_x86.c cpuid_x86_64.S volk_rank_archs.c volk_mktables.c + gcc -o volk_mktables -I$srcdir/include -I$srcdir/lib -I../include -I. $srcdir/lib/volk_cpu_x86.c $srcdir/lib/cpuid_x86_64.S $srcdir/lib/volk_rank_archs.c $srcdir/lib/volk_mktables.c ./volk_mktables ;; (*) - gcc -o volk_mktables -I../include -I. volk_cpu_x86.c cpuid_x86.S volk_rank_archs.c volk_mktables.c + gcc -o volk_mktables -I$srcdir/include -I$srcdir/lib -I../include -I. $srcdir/lib/volk_cpu_x86.c $srcdir/lib/cpuid_x86.S $srcdir/lib/volk_rank_archs.c $srcdir/lib/volk_mktables.c ./volk_mktables ;; esac ;; (powerpc) - gcc -o volk_mktables -I../include -I. volk_cpu_powerpc.c volk_rank_archs.c volk_mktables.c + gcc -o volk_mktables -I$srcdir/include -I$srcdir/lib -I../include -I. $srcdir/lib/volk_cpu_powerpc.c $srcdir/lib/volk_rank_archs.c $srcdir/lib/volk_mktables.c ./volk_mktables ;; (*) - gcc -o volk_mktables -I../include -I. volk_cpu_generic.c volk_rank_archs.c volk_mktables.c + gcc -o volk_mktables -I$srcdir/include -I$srcdir/lib -I../include -I. $srcdir/lib/volk_cpu_generic.c $srcdir/lib/volk_rank_archs.c $srcdir/lib/volk_mktables.c ./volk_mktables ;; esac |