Commit 10ab5409 authored by Josh Coalson's avatar Josh Coalson
Browse files

change to make libFLAC-asm a static, non-libtool library

parent d9c2e00a
......@@ -32,7 +32,7 @@ else
if FLaC__CPU_IA32
if FLaC__HAS_NASM
SUBDIRS = ia32 .
libFLAC_la_LIBADD = ia32/libFLAC-asm.la
libFLAC_la_LIBADD = ia32/libFLAC-asm.a
endif
endif
endif
......
......@@ -20,14 +20,16 @@ SUFFIXES = .nasm .lo
STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
.nasm.lo:
$(LIBTOOL) --tag=CC --mode=compile \
$(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $<
.nasm.o:
$(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@
#@@@OLD RULE: $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@
# patch from Ben for the above rule that may be needed with new libtool:
#.nasm.lo:
# $(LIBTOOL) --tag=CC --mode=compile \
# $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $<
noinst_LTLIBRARIES = libFLAC-asm.la
libFLAC_asm_la_SOURCES = \
noinst_LIBRARIES = libFLAC-asm.a
libFLAC_asm_a_SOURCES = \
cpu_asm.nasm \
fixed_asm.nasm \
lpc_asm.nasm
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment