From 2ac3a5429ceefe9d4d8059fb7d84f7e4bd64c644 Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Mon, 18 Jun 2001 22:16:10 +0000
Subject: [PATCH] change the naming of the object file format define to make it
 easier to configure properly

---
 src/libFLAC/Makefile.vc      | 6 +++---
 src/libFLAC/ia32/Makefile.am | 2 +-
 src/libFLAC/ia32/nasm.h      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index 4d4f0bea..174e6a36 100644
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -57,11 +57,11 @@ libFLAC.lib: $(OBJS)
 	link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)
 
 ia32/cpu_asm.obj: ia32/cpu_asm.nasm
-	$(NASM) -f win32 -d WIN32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj
+	$(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj
 ia32/fixed_asm.obj: ia32/fixed_asm.nasm
-	$(NASM) -f win32 -d WIN32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj
+	$(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj
 ia32/lpc_asm.obj: ia32/lpc_asm.nasm
-	$(NASM) -f win32 -d WIN32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj
+	$(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj
 
 clean:
 	-del *.obj ia32\*.obj *.pch
diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am
index 0b08d2d9..cbbe49fd 100644
--- a/src/libFLAC/ia32/Makefile.am
+++ b/src/libFLAC/ia32/Makefile.am
@@ -19,7 +19,7 @@
 # nasm build rule:
 SUFFIXES = .nasm .lo
 .nasm.lo:
-	$(NASM) -f elf -d ELF $< -o $@
+	$(NASM) -f elf -d OBJ_FORMAT_elf $< -o $@
 
 noinst_LTLIBRARIES = libFLAC-asm.la
 libFLAC_asm_la_SOURCES = \
diff --git a/src/libFLAC/ia32/nasm.h b/src/libFLAC/ia32/nasm.h
index 316955fb..0814826b 100644
--- a/src/libFLAC/ia32/nasm.h
+++ b/src/libFLAC/ia32/nasm.h
@@ -18,17 +18,17 @@
 
 	bits 32
 
-%ifdef WIN32
+%ifdef OBJ_FORMAT_win32
 	%define FLAC__PUBLIC_NEEDS_UNDERSCORE
 	%idefine code_section section .text align=16 class=CODE use32
 	%idefine data_section section .data align=32 class=DATA use32
 	%idefine bss_section  section .bss  align=32 class=DATA use32
-%elifdef AOUT
+%elifdef OBJ_FORMAT_aout
 	%define FLAC__PUBLIC_NEEDS_UNDERSCORE
 	%idefine code_section section .text
 	%idefine data_section section .data
 	%idefine bss_section  section .bss
-%elifdef ELF
+%elifdef OBJ_FORMAT_elf
 	%idefine code_section section .text align=16
 	%idefine data_section section .data align=32
 	%idefine bss_section  section .bss  align=32