diff options
| -rw-r--r-- | volk/configure.ac | 9 | ||||
| -rw-r--r-- | volk/include/volk/Makefile.am | 48 | ||||
| -rw-r--r-- | volk/lib/Makefile.am | 1 |
3 files changed, 54 insertions, 4 deletions
diff --git a/volk/configure.ac b/volk/configure.ac index 2051064f6..8f17e5065 100644 --- a/volk/configure.ac +++ b/volk/configure.ac @@ -63,6 +63,13 @@ dnl AX_BOOST_WSERIALIZATION AC_CONFIG_HEADERS([volk_config.h]) LV_SET_SIMD_FLAGS +# FIXME: Not very extensible to supporting more processors easily +AM_CONDITIONAL([MYCPU_X86], [test "$MD_CPU" = "x86"]) +AM_CONDITIONAL([MYSUBCPU_X86], [test "$MD_SUBCPU" = "x86"]) +AM_CONDITIONAL([MYSUBCPU_X86_64], [test "$MD_SUBCPU" = "x86_64"]) +AM_CONDITIONAL([MYSUBCPU_POWERPC], [test "$MD_SUBCPU" = "powerpc"]) +AM_CONDITIONAL([MYSUBCPU_GENERIC], [test "$MD_SUBCPU" != "powerpc" && test "$MD_SUBCPU" != "x86" && test "$MD_SUBCPU" != "x86_64"]) + AC_CONFIG_FILES([\ Makefile \ config/Makefile \ @@ -72,8 +79,6 @@ AC_CONFIG_FILES([\ volk.pc \ ]) -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 echo "" diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index 9894fdb99..256cc8420 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -20,8 +20,15 @@ include $(top_srcdir)/Makefile.common +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \ + $(LV_CXXFLAGS) $(WITH_INCLUDES) + volkincludedir = $(prefix)/include/volk +BUILT_SOURCES: \ + volk_config.h \ + volk_tables.h + volkinclude_HEADERS = \ volk_complex.h \ volk_common.h \ @@ -122,6 +129,43 @@ volkinclude_HEADERS = \ volk_8s_convert_32f_aligned16.h \ volk_8s_convert_32f_unaligned16.h +VOLK_MKTABLES_SOURCES = \ + $(abs_top_srcdir)/lib/volk_rank_archs.c \ + $(abs_top_srcdir)/lib/volk_mktables.c + + +# FIXME: Not very extensible to supporting more processors easily +if MYSUBCPU_X86_64 + VOLK_MKTABLES_SOURCES += \ + $(abs_top_srcdir)/lib/volk_cpu_x86.c \ + $(abs_top_srcdir)/lib/cpuid_x86_64.S +endif + +if MYSUBCPU_X86 + VOLK_MKTABLES_SOURCES += \ + $(abs_top_srcdir)/lib/volk_cpu_x86.c \ + $(abs_top_srcdir)/lib/cpuid_x86.S +endif + +if MYSUBCPU_POWERPC + VOLK_MKTABLES_SOURCES += \ + $(abs_top_srcdir)/lib/volk_cpu_powerpc.c +endif + +if MYSUBCPU_GENERIC + VOLK_MKTABLES_SOURCES += \ + $(abs_top_srcdir)/lib/volk_cpu_generic.c +endif + +volk_mktables$(EXEEXT): $(VOLK_MKTABLES_SOURCES) + $(CC) -o $@ $^ $(AM_CPPFLAGS) + +volk_tables.h: volk_mktables$(EXEEXT) + ./volk_mktables$(EXEEXT) + +volk_config.h: $(abs_top_builddir)/volk_config.h + cp $^ $(abs_top_builddir)/include/volk/$@ + distclean-local: rm -f volk_config_fixed.h rm -f volk_config.h @@ -133,4 +177,6 @@ distclean-local: rm -f volk_tables.h rm -f *.pyc rm -f Makefile.in - rm -f volk_environment_init.h
\ No newline at end of file + rm -f volk_environment_init.h + rm -f volk_mktables + rm -f $(BUILT_SOURCES)
\ No newline at end of file diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index a95860d11..814d438fd 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -353,7 +353,6 @@ distclean-local: rm -f volk_cpu_x86.c rm -f volk_init.c rm -f volk_init.h - rm -f volk_mktables rm -f volk_mktables.c rm -f volk_proccpu_sim.c rm -f volk_runtime.c |