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/include | |
| 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/include')
| -rw-r--r-- | volk/include/volk/Makefile.am | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index 04a43bd34..658974d3a 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -130,33 +130,11 @@ volkinclude_HEADERS = \ volk_8s_convert_32f_unaligned16.h VOLK_MKTABLES_SOURCES = \ + $(platform_CODE) \ $(top_srcdir)/lib/volk_rank_archs.c \ $(top_srcdir)/lib/volk_mktables.c -# FIXME: Not very extensible to supporting more processors easily -if MYSUBCPU_X86_64 - VOLK_MKTABLES_SOURCES += \ - $(top_srcdir)/lib/volk_cpu_x86.c \ - $(top_srcdir)/lib/cpuid_x86_64.S -endif - -if MYSUBCPU_X86 - VOLK_MKTABLES_SOURCES += \ - $(top_srcdir)/lib/volk_cpu_x86.c \ - $(top_srcdir)/lib/cpuid_x86.S -endif - -if MYSUBCPU_POWERPC - VOLK_MKTABLES_SOURCES += \ - $(top_srcdir)/lib/volk_cpu_powerpc.c -endif - -if MYSUBCPU_GENERIC - VOLK_MKTABLES_SOURCES += \ - $(top_srcdir)/lib/volk_cpu_generic.c -endif - volk_mktables$(EXEEXT): $(VOLK_MKTABLES_SOURCES) $(CC) -o $@ $^ $(AM_CPPFLAGS) -I$(top_builddir)/include |