diff options
| author | Tom Rondeau | 2011-01-14 19:58:11 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-14 19:58:11 -0500 |
| commit | 81c3086bee1752c94a89ab2d20b7de048fdd1be7 (patch) | |
| tree | b03d60528ed38368a6b2ad9b4a9944073b3b0841 /volk/Makefile.common | |
| parent | bb438e7d12c5767123f8abed5810f284a5f18bf8 (diff) | |
| download | gnuradio-81c3086bee1752c94a89ab2d20b7de048fdd1be7.tar.gz gnuradio-81c3086bee1752c94a89ab2d20b7de048fdd1be7.tar.bz2 gnuradio-81c3086bee1752c94a89ab2d20b7de048fdd1be7.zip | |
Cleans up the Makefiles for the various platforms. This should also make it easier to add new architectures. Thanks to Josh for the inspiration.
Diffstat (limited to 'volk/Makefile.common')
| -rw-r--r-- | volk/Makefile.common | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/volk/Makefile.common b/volk/Makefile.common index 083f6f710..daa8d78b6 100644 --- a/volk/Makefile.common +++ b/volk/Makefile.common @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,33 @@ # Boston, MA 02110-1301, USA. # +if MD_CPU_generic + platform_CODE = \ + $(top_srcdir)/lib/volk_cpu_generic.c +endif + +if MD_CPU_x86 +if MD_SUBCPU_x86_64 + platform_CODE = \ + $(top_srcdir)/lib/volk_cpu_x86.c \ + $(top_srcdir)/lib/cpuid_x86_64.S +endif +endif + +if MD_CPU_x86 +if !MD_SUBCPU_x86_64 + platform_CODE = \ + $(top_srcdir)/lib/volk_cpu_x86.c \ + $(top_srcdir)/lib/cpuid_x86.S +endif +endif + +if MD_CPU_powerpc + platform_CODE = \ + $(top_srcdir)/lib/volk_cpu_powerpc.c +endif + + ourincludedir = $(includedir)/volk # swig includes @@ -44,3 +71,4 @@ STD_DEFINES_AND_INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib $(GNURADIO # not. We define it now in configure.ac using AM_PATH_PROG, but now # here have to add a -f to be like GNU make. RM=$(RM_PROG) -f + |