Honor external CCFLAGS and LDFLAGS

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index ba2c9ef318469c61fd5af169e75ce46c0443dfc3..291efd2a6f282d32b113c05a1584cb00dce6057e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for the open-source release of adventure 2.5
 
 CC?=gcc
-CCFLAGS=-std=c99
+CCFLAGS+=-std=c99
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -9,14 +9,14 @@ ifeq ($(UNAME_S),Linux)
 endif
 
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
-DOCS=COPYING NEWS README TODO advent.adoc history.adoc index.adoc hints.adoc
-SOURCES=$(OBJS:.o=.c) advent.h funcs.h adventure.text $(DOCS) control
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc index.adoc hints.adoc
+SOURCES=$(OBJS:.o=.c) compile.c advent.h database.h funcs.h adventure.text $(DOCS) Makefile control
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LIBS)
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LDFLAGS) $(LIBS)
 
 main.o:                advent.h funcs.h database.h