change NASM file extensions from .s to .nasm

diff --git a/build/exe.mk b/build/exe.mk
index 50a78032080c305f1ed492c67399950f8e87b411..f146d61b2a6ceaf5885ba3744210d35f2605cbd1 100644 (file)
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -46,7 +46,7 @@ $(PROGRAM) : $(OBJS)
 %.i : %.c
        $(CC) $(CFLAGS) -E $< -o $@
 
-%.o : %.s
+%.o : %.nasm
        $(NASM) -f elf -d ELF -i i386/ $< -o $@
 
 .PHONY : clean

diff --git a/build/lib.mk b/build/lib.mk
index 78efe3c3b9a4c775d16da06f61c2581aa192c108..dc9dec2a9fc1115093d202161579cf89e5a3f523 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -48,7 +48,7 @@ $(DYNAMIC_LIB) : $(OBJS)
 %.i : %.c
        $(CC) $(CFLAGS) -E $< -o $@
 
-%.o : %.s
+%.o : %.nasm
        $(NASM) -f elf -d ELF -i i386/ $< -o $@
 
 .PHONY : clean

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index d20c86bb45cfc92b44ea65bf9a804c8b95faade2..9cfbac5fadf658e06f17b161b5ad1e1183f9ad61 100644 (file)
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -45,23 +45,23 @@ C_FILES= \
        stream_encoder_framing.c\r
 \r
 NASM_FILES= \\r
-       i386/cpu_asm.s \\r
-       i386/fixed_asm.s \\r
-       i386/lpc_asm.s\r
+       i386/cpu_asm.nasm \\r
+       i386/fixed_asm.nasm \\r
+       i386/lpc_asm.nasm\r
 \r
-OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.s=.obj)\r
+OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.nasm=.obj)\r
 \r
 all: libFLAC.lib\r
 \r
 libFLAC.lib: $(OBJS)\r
        link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)\r
 \r
-i386/cpu_asm.obj: i386/cpu_asm.s\r
-       $(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.s -o i386/cpu_asm.obj\r
-i386/fixed_asm.obj: i386/fixed_asm.s\r
-       $(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.s -o i386/fixed_asm.obj\r
-i386/lpc_asm.obj: i386/lpc_asm.s\r
-       $(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.s -o i386/lpc_asm.obj\r
+i386/cpu_asm.obj: i386/cpu_asm.nasm\r
+       $(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.nasm -o i386/cpu_asm.obj\r
+i386/fixed_asm.obj: i386/fixed_asm.nasm\r
+       $(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.nasm -o i386/fixed_asm.obj\r
+i386/lpc_asm.obj: i386/lpc_asm.nasm\r
+       $(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.nasm -o i386/lpc_asm.obj\r
 \r
 clean:\r
        -del *.obj i386\*.obj *.pch\r

diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am
index bdbb919afdbd668613ca4c5b5653003086184c1b..0b08d2d9f04b568a05945e8f6670698fdc3dd982 100644 (file)
--- a/src/libFLAC/ia32/Makefile.am
+++ b/src/libFLAC/ia32/Makefile.am
@@ -17,12 +17,12 @@
 #  Boston, MA  02111-1307, USA.
 
 # nasm build rule:
-SUFFIXES = .s .lo
-.s.lo:
+SUFFIXES = .nasm .lo
+.nasm.lo:
        $(NASM) -f elf -d ELF $< -o $@
 
 noinst_LTLIBRARIES = libFLAC-asm.la
 libFLAC_asm_la_SOURCES = \
-       cpu_asm.s \
-       fixed_asm.s \
-       lpc_asm.s
+       cpu_asm.nasm \
+       fixed_asm.nasm \
+       lpc_asm.nasm