add memory.c, fix to work with i386 convenience library (thanks mdz)

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 80b1dfc..e062d6c 100644 (file)
--- 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,47 +9,21 @@ else
 CFLAGS = @CFLAGS@ -DFLAC__PRECOMPUTE_PARTITION_SUMS
 endif
 
+if FLaC__NO_ASM
+else
 if FLaC__CPU_IA32 
 if FLaC__HAS_NASM
-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 \
-       encoder.c \
-       encoder_framing.c \
-       file_decoder.c \
-       fixed.c \
-       format.c \
-       lpc.c \
-       md5.c \
-       seek_table.c \
-       stream_decoder.c
+SUBDIRS = i386 .
+libFLAC_la_LIBADD = i386/libFLAC-asm.la
 endif
-else
+endif
+endif
+
 libFLAC_la_SOURCES = \
        bitbuffer.c \
        bitmath.c \
-       crc.c \
        cpu.c \
+       crc.c \
        encoder.c \
        encoder_framing.c \
        file_decoder.c \
@@ -61,6 +31,6 @@ libFLAC_la_SOURCES = \
        format.c \
        lpc.c \
        md5.c \
+       memory.c \
        seek_table.c \
        stream_decoder.c
-endif