Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Side by Side Diff: Makefile.am

Issue 882843002: Update to opus-HEAD-66611f1. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/opus.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « INSTALL ('k') | Makefile.in » ('j') | autogen.sh » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Provide the full test output for failed tests when using the parallel 1 # Provide the full test output for failed tests when using the parallel
2 # test suite (which is enabled by default with automake 1.13+). 2 # test suite (which is enabled by default with automake 1.13+).
3 export VERBOSE = yes 3 export VERBOSE = yes
4 4
5 AUTOMAKE_OPTIONS = subdir-objects 5 AUTOMAKE_OPTIONS = subdir-objects
6 ACLOCAL_AMFLAGS = -I m4 6 ACLOCAL_AMFLAGS = -I m4
7 7
8 lib_LTLIBRARIES = libopus.la 8 lib_LTLIBRARIES = libopus.la
9 9
10 DIST_SUBDIRS = doc 10 DIST_SUBDIRS = doc
11 11
12 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/celt -I$(top_srcdir)/silk \ 12 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/celt -I$(top_srcdir)/silk \
13 -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed 13 -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
14 14
15 include celt_sources.mk 15 include celt_sources.mk
16 include silk_sources.mk 16 include silk_sources.mk
17 include opus_sources.mk 17 include opus_sources.mk
18 18
19 if FIXED_POINT 19 if FIXED_POINT
20 SILK_SOURCES += $(SILK_SOURCES_FIXED) 20 SILK_SOURCES += $(SILK_SOURCES_FIXED)
21 if HAVE_SSE4_1
22 SILK_SOURCES += $(SILK_SOURCES_SSE4_1) $(SILK_SOURCES_FIXED_SSE4_1)
23 endif
21 else 24 else
22 SILK_SOURCES += $(SILK_SOURCES_FLOAT) 25 SILK_SOURCES += $(SILK_SOURCES_FLOAT)
23 endif 26 endif
24 27
25 if DISABLE_FLOAT_API 28 if DISABLE_FLOAT_API
26 else 29 else
27 OPUS_SOURCES += $(OPUS_SOURCES_FLOAT) 30 OPUS_SOURCES += $(OPUS_SOURCES_FLOAT)
28 endif 31 endif
29 32
33 if HAVE_SSE4_1
34 CELT_SOURCES += $(CELT_SOURCES_SSE) $(CELT_SOURCES_SSE4_1)
35 else
36 if HAVE_SSE2
37 CELT_SOURCES += $(CELT_SOURCES_SSE)
38 endif
39 endif
40
30 if CPU_ARM 41 if CPU_ARM
31 CELT_SOURCES += $(CELT_SOURCES_ARM) 42 CELT_SOURCES += $(CELT_SOURCES_ARM)
32 SILK_SOURCES += $(SILK_SOURCES_ARM) 43 SILK_SOURCES += $(SILK_SOURCES_ARM)
44
45 if OPUS_ARM_NEON_INTR
46 CELT_SOURCES += $(CELT_SOURCES_ARM_NEON_INTR)
47 OPUS_ARM_NEON_INTR_CPPFLAGS = -mfpu=neon
48 endif
49
33 if OPUS_ARM_EXTERNAL_ASM 50 if OPUS_ARM_EXTERNAL_ASM
34 nodist_libopus_la_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) 51 nodist_libopus_la_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S)
35 BUILT_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \ 52 BUILT_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \
36 $(CELT_AM_SOURCES_ARM_ASM:.s.in=.s) \ 53 $(CELT_AM_SOURCES_ARM_ASM:.s.in=.s) \
37 $(CELT_AM_SOURCES_ARM_ASM:.s.in=-gnu.S) 54 $(CELT_AM_SOURCES_ARM_ASM:.s.in=-gnu.S)
38 endif 55 endif
39 endif 56 endif
40 57
41 CLEANFILES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \ 58 CLEANFILES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \
42 $(CELT_AM_SOURCES_ARM_ASM:.s.in=-gnu.S) 59 $(CELT_AM_SOURCES_ARM_ASM:.s.in=-gnu.S)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 celt_tests_test_unit_dft_LDADD = $(LIBM) 105 celt_tests_test_unit_dft_LDADD = $(LIBM)
89 106
90 celt_tests_test_unit_entropy_SOURCES = celt/tests/test_unit_entropy.c 107 celt_tests_test_unit_entropy_SOURCES = celt/tests/test_unit_entropy.c
91 celt_tests_test_unit_entropy_LDADD = $(LIBM) 108 celt_tests_test_unit_entropy_LDADD = $(LIBM)
92 109
93 celt_tests_test_unit_laplace_SOURCES = celt/tests/test_unit_laplace.c 110 celt_tests_test_unit_laplace_SOURCES = celt/tests/test_unit_laplace.c
94 celt_tests_test_unit_laplace_LDADD = $(LIBM) 111 celt_tests_test_unit_laplace_LDADD = $(LIBM)
95 112
96 celt_tests_test_unit_mathops_SOURCES = celt/tests/test_unit_mathops.c 113 celt_tests_test_unit_mathops_SOURCES = celt/tests/test_unit_mathops.c
97 celt_tests_test_unit_mathops_LDADD = $(LIBM) 114 celt_tests_test_unit_mathops_LDADD = $(LIBM)
115 if CPU_ARM
116 if OPUS_ARM_EXTERNAL_ASM
117 celt_tests_test_unit_mathops_LDADD += libopus.la
118 endif
119 endif
98 120
99 celt_tests_test_unit_mdct_SOURCES = celt/tests/test_unit_mdct.c 121 celt_tests_test_unit_mdct_SOURCES = celt/tests/test_unit_mdct.c
100 celt_tests_test_unit_mdct_LDADD = $(LIBM) 122 celt_tests_test_unit_mdct_LDADD = $(LIBM)
101 123
102 celt_tests_test_unit_rotation_SOURCES = celt/tests/test_unit_rotation.c 124 celt_tests_test_unit_rotation_SOURCES = celt/tests/test_unit_rotation.c
103 celt_tests_test_unit_rotation_LDADD = $(LIBM) 125 celt_tests_test_unit_rotation_LDADD = $(LIBM)
126 if CPU_ARM
127 if OPUS_ARM_EXTERNAL_ASM
128 celt_tests_test_unit_rotation_LDADD += libopus.la
129 endif
130 endif
104 131
105 celt_tests_test_unit_types_SOURCES = celt/tests/test_unit_types.c 132 celt_tests_test_unit_types_SOURCES = celt/tests/test_unit_types.c
106 celt_tests_test_unit_types_LDADD = $(LIBM) 133 celt_tests_test_unit_types_LDADD = $(LIBM)
107 endif 134 endif
108 135
109 if CUSTOM_MODES 136 if CUSTOM_MODES
110 pkginclude_HEADERS += include/opus_custom.h 137 pkginclude_HEADERS += include/opus_custom.h
111 if EXTRA_PROGRAMS 138 if EXTRA_PROGRAMS
112 noinst_PROGRAMS += opus_custom_demo 139 noinst_PROGRAMS += opus_custom_demo
113 opus_custom_demo_SOURCES = celt/opus_custom_demo.c 140 opus_custom_demo_SOURCES = celt/opus_custom_demo.c
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 245
219 246
220 .PHONY: opus check-opus install-opus docs install-docs 247 .PHONY: opus check-opus install-opus docs install-docs
221 248
222 # automake doesn't do dependency tracking for asm files, that I can tell 249 # automake doesn't do dependency tracking for asm files, that I can tell
223 $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): celt/arm/armopts-gnu.S 250 $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): celt/arm/armopts-gnu.S
224 $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl 251 $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl
225 252
226 # convert ARM asm to GNU as format 253 # convert ARM asm to GNU as format
227 %-gnu.S: $(top_srcdir)/%.s 254 %-gnu.S: $(top_srcdir)/%.s
228 » $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@ 255 » $(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
229 # For autoconf-modified sources (e.g., armopts.s) 256 # For autoconf-modified sources (e.g., armopts.s)
230 %-gnu.S: %.s 257 %-gnu.S: %.s
231 » $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@ 258 » $(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
259
260 SSE_OBJ = %_sse.o %_sse.lo %test_unit_mathops.o %test_unit_rotation.o
261
262 if HAVE_SSE4_1
263 $(SSE_OBJ): CFLAGS += -msse4.1
264 else
265 if HAVE_SSE2
266 $(SSE_OBJ): CFLAGS += -msse2
267 endif
268 endif
269
270 if OPUS_ARM_NEON_INTR
271 CELT_ARM_NEON_INTR_OBJ = $(CELT_SOURCES_ARM_NEON_INTR:.c=.lo) \
272 » » » %test_unit_rotation.o %test_unit_mathops.o
273 $(CELT_ARM_NEON_INTR_OBJ): CFLAGS += $(OPUS_ARM_NEON_INTR_CPPFLAGS)
274 endif
OLDNEW
« no previous file with comments | « INSTALL ('k') | Makefile.in » ('j') | autogen.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698