mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Josh Coalson 2001-07-20 23:46:09 +00:00
parent d9c2e00a38
commit 10ab54092b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libFLAC/Makefile.am
View File

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

14
src/libFLAC/ia32/Makefile.am
View File

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