From c14c5952a714b362436c367b30348849a61207dd Mon Sep 17 00:00:00 2001 From: Michael Jarvis Date: Thu, 1 Jun 2017 22:52:26 -0500 Subject: [PATCH] Revert "Add explicit rule for compile to use CCFLAGS instead of CFLAGS" This reverts commit c29e30d25cce4a92d617d79a49d97643fb9261a7. --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7b81be6..23cd7f9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile for the open-source release of adventure 2.5 -CC=clang -CCFLAGS=-O2 -std=c99 -Wall -Wextra -Wpedantic -fstack-protector -fstack-protector-all -pipe -mtune=native +CC?=gcc +CCFLAGS=-std=c99 LIBS= UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) @@ -33,9 +33,6 @@ database.o: database.h funcs.h: database.h -compile: compile.c - $(CC) $(CCFLAGS) -o $@ $< - database.c database.h: compile adventure.text ./compile $(CC) $(CCFLAGS) -O $(DBX) -c database.c -- 2.31.1