From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Tue, 19 Jun 2001 06:48:21 +0000 (+0000)
Subject: minor fixes
X-Git-Tag: 1.2.0~2222
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1162f1829ed7af5d4bdfde890480c8b9136e03e4;p=platform%2Fupstream%2Fflac.git

minor fixes
---

diff --git a/build/exe.mk b/build/exe.mk
index 369464d..18e6e8f 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -30,8 +30,8 @@ PROGRAM     = $(BINPATH)/$(PROGRAM_NAME)
 
 all : release
 
-debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION="1.0devel" $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION="1.0devel" $(DEFINES) $(INCLUDES)
+debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
+release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
 
 LFLAGS  = -L$(LIBPATH)
 
@@ -47,7 +47,7 @@ $(PROGRAM) : $(OBJS)
 	$(CC) $(CFLAGS) -E $< -o $@
 
 %.o : %.nasm
-	$(NASM) -f elf -d ELF -i ia32/ $< -o $@
+	$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
 
 .PHONY : clean
 clean :
diff --git a/build/lib.mk b/build/lib.mk
index 47eee47..c1090a8 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -29,8 +29,8 @@ DYNAMIC_LIB = $(LIBPATH)/$(LIB_NAME).so
 
 all : release
 
-debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION="1.0devel" $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION="1.0devel" $(DEFINES) $(INCLUDES)
+debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
+release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
 
 LFLAGS  = -L$(LIBPATH)
 
@@ -49,7 +49,7 @@ $(DYNAMIC_LIB) : $(OBJS)
 	$(CC) $(CFLAGS) -E $< -o $@
 
 %.o : %.nasm
-	$(NASM) -f elf -d ELF -i ia32/ $< -o $@
+	$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
 
 .PHONY : clean
 clean :