From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Fri, 20 Jul 2001 23:46:09 +0000 (+0000)
Subject: change to make libFLAC-asm a static, non-libtool library
X-Git-Tag: 1.2.0~2133
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10ab54092b3f7d0077b43f53d323914215e5e150;p=platform%2Fupstream%2Fflac.git

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

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 296205f..2e97617 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -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
diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am
index c56616e..82295c5 100644
--- a/src/libFLAC/ia32/Makefile.am
+++ b/src/libFLAC/ia32/Makefile.am
@@ -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