Merge branch 'exp_mips_opt'
[opus.git] / Makefile.am
index cbedb50..fac7651 100644 (file)
@@ -31,13 +31,16 @@ if CPU_ARM
 CELT_SOURCES += $(CELT_SOURCES_ARM)
 SILK_SOURCES += $(SILK_SOURCES_ARM)
 if OPUS_ARM_EXTERNAL_ASM
-CELT_SOURCES += $(CELT_SOURCES_ARM_ASM:.s=-gnu.S)
+nodist_libopus_la_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S)
 BUILT_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \
  $(CELT_AM_SOURCES_ARM_ASM:.s.in=.s) \
  $(CELT_AM_SOURCES_ARM_ASM:.s.in=-gnu.S)
 endif
 endif
 
+CLEANFILES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \
+ $(CELT_AM_SOURCES_ARM_ASM:.s.in=-gnu.S)
+
 include celt_headers.mk
 include silk_headers.mk
 include opus_headers.mk
@@ -119,6 +122,7 @@ EXTRA_DIST = version.mk \
              Makefile.unix \
              tests/run_vectors.sh \
              celt/arm/arm2gnu.pl \
+             celt/arm/celt_pitch_xcorr_arm.s \
              win32/VS2010/silk_float.vcxproj \
              win32/VS2010/celt.vcxproj.filters \
              win32/VS2010/opus.vcxproj \
@@ -221,7 +225,7 @@ $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl
 
 # convert ARM asm to GNU as format
 %-gnu.S: $(top_srcdir)/%.s
-       $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@
+       $(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
 # For autoconf-modified sources (e.g., armopts.s)
 %-gnu.S: %.s
-       $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@
+       $(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@