From c8ef8353bfc674d548be123a7b71f452a43a0711 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 25 May 2001 00:06:33 +0000 Subject: [PATCH] add memory.c, fix to work with i386 convenience library (thanks mdz) --- src/libFLAC/Makefile.am | 50 +++++++++-------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 80b1dfc9..e062d6c9 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -2,10 +2,6 @@ # GNU makefile # -SUFFIXES = .nasm -.nasm.o: - $(NASM) -f elf -d ELF -i i386/ $< -o $@ - lib_LTLIBRARIES = libFLAC.la if DEBUG CFLAGS += @CFLAGS@ -DFLAC__PRECOMPUTE_PARTITION_SUMS -DFLAC__OVERFLOW_DETECT @@ -13,31 +9,21 @@ else CFLAGS = @CFLAGS@ -DFLAC__PRECOMPUTE_PARTITION_SUMS endif +if FLaC__NO_ASM +else if FLaC__CPU_IA32 if FLaC__HAS_NASM +SUBDIRS = i386 . +libFLAC_la_LIBADD = i386/libFLAC-asm.la +endif +endif +endif + libFLAC_la_SOURCES = \ bitbuffer.c \ bitmath.c \ - crc.c \ - cpu.c \ - encoder.c \ - encoder_framing.c \ - file_decoder.c \ - fixed.c \ - format.c \ - lpc.c \ - md5.c \ - seek_table.c \ - stream_decoder.c \ - i386/cpu_asm.nasm \ - i386/fixed_asm.nasm \ - i386/lpc_asm.nasm -else -libFLAC_la_SOURCES = \ - bitbuffer.c \ - bitmath.c \ - crc.c \ cpu.c \ + crc.c \ encoder.c \ encoder_framing.c \ file_decoder.c \ @@ -45,22 +31,6 @@ libFLAC_la_SOURCES = \ format.c \ lpc.c \ md5.c \ + memory.c \ seek_table.c \ stream_decoder.c -endif -else -libFLAC_la_SOURCES = \ - bitbuffer.c \ - bitmath.c \ - crc.c \ - cpu.c \ - encoder.c \ - encoder_framing.c \ - file_decoder.c \ - fixed.c \ - format.c \ - lpc.c \ - md5.c \ - seek_table.c \ - stream_decoder.c -endif