diff options
| author | Tom Rondeau | 2011-01-15 15:26:40 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-15 15:26:40 -0500 |
| commit | cb3520203232d958962bd3b871f22675fe9c6bb5 (patch) | |
| tree | 2e32c70447a32e965d127d4b359745d2d552258c /volk/lib | |
| parent | a2262b6bb70923d89e96ca0d597d96a8a01e4b67 (diff) | |
| parent | 2e8610450bc467400f8de2976cc6c1743025aff1 (diff) | |
| download | gnuradio-cb3520203232d958962bd3b871f22675fe9c6bb5.tar.gz gnuradio-cb3520203232d958962bd3b871f22675fe9c6bb5.tar.bz2 gnuradio-cb3520203232d958962bd3b871f22675fe9c6bb5.zip | |
Merge branch 'volkosx' into next
Diffstat (limited to 'volk/lib')
| -rw-r--r-- | volk/lib/Makefile.am | 74 |
1 files changed, 7 insertions, 67 deletions
diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 814d438fd..896d568e6 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/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 # @@ -61,77 +61,17 @@ EXTRA_DIST = \ # The main library # ---------------------------------------------------------------- -universal_runtime_CODE = \ - volk_runtime.c \ - volk_init.c \ +libvolk_runtime_la_SOURCES = \ + $(platform_CODE) \ + volk_runtime.c \ + volk_init.c \ volk_rank_archs.c -universal_CODE = \ +libvolk_la_SOURCES = \ + $(platform_CODE) \ volk.c \ volk_environment_init.c -generic_CODE = \ - volk_cpu_generic.c - -x86_CODE = \ - volk_cpu_x86.c - -x86_SUBCODE = \ - cpuid_x86.S - -x86_64_SUBCODE = \ - cpuid_x86_64.S - -powerpc_CODE = \ - volk_cpu_powerpc.c - - -if MD_CPU_generic -libvolk_la_SOURCES = \ - $(generic_CODE) \ - $(universal_CODE) -libvolk_runtime_la_SOURCES = \ - $(generic_CODE) \ - $(universal_runtime_CODE) - -endif - -if MD_CPU_x86 -if MD_SUBCPU_x86_64 -libvolk_la_SOURCES = \ - $(x86_CODE) \ - $(x86_64_SUBCODE) \ - $(universal_CODE) - -libvolk_runtime_la_SOURCES = \ - $(x86_CODE) \ - $(x86_64_SUBCODE) \ - $(universal_runtime_CODE) -else -libvolk_la_SOURCES = \ - $(x86_CODE) \ - $(x86_SUBCODE) \ - $(universal_CODE) - -libvolk_runtime_la_SOURCES = \ - $(x86_CODE) \ - $(x86_SUBCODE) \ - $(universal_runtime_CODE) -endif -endif - - -if MD_CPU_powerpc -libvolk_la_SOURCES = \ - $(powerpc_CODE) \ - $(universal_CODE) - -libvolk_runtime_la_SOURCES = \ - $(powerpc_CODE) \ - $(universal_runtime_CODE) -endif - - libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 |