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

This commit is contained in:
Josh Coalson
2001-05-25 00:06:33 +00:00
parent 45d7bfc891
commit c8ef8353bf

View File

@@ -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