From c371684e5e644e1fa7a2fdfb07961a81754a0d11 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 12 Apr 2006 16:54:17 +0000 Subject: [PATCH] Makefile changes to fix the clean option Changed arch from 686 to 586 --- dlls/sqlite/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/sqlite/Makefile b/dlls/sqlite/Makefile index 9cf5fe37..ff0cb214 100755 --- a/dlls/sqlite/Makefile +++ b/dlls/sqlite/Makefile @@ -10,9 +10,12 @@ OPT_FLAGS = -O3 -funroll-loops -s -pipe -fomit-frame-pointer DEBUG_FLAGS = -g -ggdb3 CPP = gcc CC = cc -NAME = sqlite_amxx +NAME = sqlite SQL = sqlite-source +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so + CPP_OBJECTS = sqlite.cpp sqlite_amx.cpp amxxmodule.cpp C_OBJECTS = $(SQL)/attach.c $(SQL)/auth.c $(SQL)/btree.c $(SQL)/build.c \ $(SQL)/date.c $(SQL)/delete.c $(SQL)/func.c $(SQL)/hash.c \ @@ -44,12 +47,12 @@ CPPFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -fno- CFLAGS += -DNDEBUG -fPIC -DHAVE_STDINT_H ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 - OPT_FLAGS += -march=i686 + OPT_FLAGS += -march=i586 endif OBJ_LINUX_CPP := $(CPP_OBJECTS:%.cpp=$(BIN_DIR)/%.o) @@ -80,9 +83,9 @@ debug: default: all clean: - rm -rf Release/$(SQL)/*.o rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)