diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-12-08 17:00:38 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-12-08 17:00:38 -0500 |
| commit | 1cc88091470dd4654b6936cda92d81841e135209 (patch) | |
| tree | bbf2b7c4b3fa7746a301146143cef02099d376d6 | |
| parent | 46d55649012e4fb2838a6f8e9f3c9226ea8b2d50 (diff) | |
volk: more changes to build system so that VPATH builds properly and project makes distcheck.
| -rw-r--r-- | Makefile.common | 8 | ||||
| -rw-r--r-- | volk/config/lv_configure.m4 | 2 | ||||
| -rw-r--r-- | volk/include/volk/make_set_simd.py | 8 | ||||
| -rw-r--r-- | volk/lib/Makefile.am | 11 |
4 files changed, 19 insertions, 10 deletions
diff --git a/Makefile.common b/Makefile.common index 95dacf987e..60f7de8040 100644 --- a/Makefile.common +++ b/Makefile.common @@ -58,7 +58,7 @@ libspudir = $(libdir)spu # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. STD_DEFINES_AND_INCLUDES = $(DEFINES) $(GNURADIO_INCLUDES) \ - $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) + $(GRUEL_INCLUDES) $(VOLK_INCLUDES) $(BOOST_CPPFLAGS) # when including for compilation from pre-installed libraries and such, # need to make sure those are put last on the compile command @@ -72,10 +72,14 @@ GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@ # How to link in GNU Radio core library from inside the tree GNURADIO_CORE_LA = @gnuradio_core_LA@ -# How to link in the USRP library from inside the tree +# How to link in the GRUEL library from inside the tree GRUEL_INCLUDES = @gruel_INCLUDES@ GRUEL_LA = @gruel_LA@ +# How to link in the VOLK library from inside the tree +VOLK_INCLUDES = @volk_INCLUDES@ +VOLK_LA = @volk_LA@ + # How to link in the USRP library from inside the tree USRP_INCLUDES = @usrp_INCLUDES@ USRP_LA = @usrp_LA@ diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4 index efcec5d3e8..c7a5fe960c 100644 --- a/volk/config/lv_configure.m4 +++ b/volk/config/lv_configure.m4 @@ -111,7 +111,7 @@ dnl AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes]) PKG_CHECK_EXISTS(cppunit, [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)], [AM_PATH_CPPUNIT([1.9.14],[], - [AC_MSG_ERROR([LIBVECTOR requires cppunit. Stop])])]) + [AC_MSG_ERROR([VOLK requires cppunit. Stop])])]) dnl PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3) dnl LIBS="$LIBS $GNURADIO_CORE_LIBS" diff --git a/volk/include/volk/make_set_simd.py b/volk/include/volk/make_set_simd.py index c35aa06fa2..03c2b2d8f0 100644 --- a/volk/include/volk/make_set_simd.py +++ b/volk/include/volk/make_set_simd.py @@ -12,7 +12,7 @@ def make_set_simd(dom) : tempstring = tempstring + " (x86)\n"; tempstring = tempstring + " case \"$MD_SUBCPU\" in\n"; tempstring = tempstring + " (x86)\n"; - tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I ./include/ -I./lib lib/volk_proccpu_sim.c lib/volk_cpu_x86.c lib/cpuid_x86.S 2>&1`\"\n"; + tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I $srcdir/include/ -I$srcdir/lib $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_x86.c $srcdir/lib/cpuid_x86.S`\"\n"; tempstring = tempstring + " then\n"; tempstring = tempstring + " AC_MSG_RESULT(yes)\n"; tempstring = tempstring + " lv_PROCCPU=\"`./proccpu`\"\n"; @@ -23,7 +23,7 @@ def make_set_simd(dom) : tempstring = tempstring + " fi\n" tempstring = tempstring + " ;;\n" tempstring = tempstring + " (*)\n" - tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I ./include/ -I./lib lib/volk_proccpu_sim.c lib/volk_cpu_x86.c lib/cpuid_x86_64.S 2>&1`\"\n"; + tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I$srcdir/include/ -I$srcdir/lib $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_x86.c $srcdir/lib/cpuid_x86_64.S`\"\n"; tempstring = tempstring + " then\n"; tempstring = tempstring + " AC_MSG_RESULT(yes)\n"; tempstring = tempstring + " lv_PROCCPU=\"`./proccpu`\"\n"; @@ -36,7 +36,7 @@ def make_set_simd(dom) : tempstring = tempstring + " esac\n" tempstring = tempstring + " ;;\n"; tempstring = tempstring + " (powerpc)\n"; - tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I ./include/ lib/volk_proccpu_sim.c lib/volk_cpu_powerpc.c 2>&1`\"\n"; + tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I$srcdir/include/ $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_powerpc.c 2>&1`\"\n"; tempstring = tempstring + " then\n"; tempstring = tempstring + " AC_MSG_RESULT(yes)\n"; tempstring = tempstring + " lv_PROCCPU=\"`./proccpu`\"\n"; @@ -47,7 +47,7 @@ def make_set_simd(dom) : tempstring = tempstring + " fi\n" tempstring = tempstring + " ;;\n"; tempstring = tempstring + " (*)\n"; - tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I ./include/ lib/volk_proccpu_sim.c lib/volk_cpu_generic.c 2>&1`\"\n"; + tempstring = tempstring + " if test -z \"`${CC} -o proccpu -I$srcdir/include/ $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_generic.c 2>&1`\"\n"; tempstring = tempstring + " then\n"; tempstring = tempstring + " AC_MSG_RESULT(yes)\n"; tempstring = tempstring + " lv_PROCCPU=\"`./proccpu`\"\n"; diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 4ee934e8b2..7e808695f8 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,7 +20,9 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) $(LV_CXXFLAGS) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \ + -I$(top_builddir)/include \ + $(LV_CXXFLAGS) $(WITH_INCLUDES) # We build 2 libraries and 1 executable here. One library contains @@ -46,7 +48,10 @@ lib_LTLIBRARIES = \ libvolk_runtime.la \ libvolk_qa.la -EXTRA_DIST = volk_mktables.c +EXTRA_DIST = \ + volk_mktables.c \ + volk_rank_archs.h \ + volk_proccpu_sim.c # ---------------------------------------------------------------- # The main library |