summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGulliver <gulliver@fargonauten.de>2014-10-09 00:26:00 +0200
committerGulliver <gulliver@fargonauten.de>2014-10-09 00:26:00 +0200
commit1703abe7a21f5014ce00f04bd95d2aa4e1ba81c0 (patch)
tree9322050c9ddae98f4b72f1b6135973093087bb15 /Makefile
parent5a793c07ae644e3f0cc75a919d551a1e8ff630f4 (diff)
parentb44fad1d62311f81f38997b548b466a219ae59c6 (diff)
Merge branch 'master' into cmake-build
* master: Adds missing newlines Changes urls to use example.com Changes append to prepend Suppress 'missing field initializer' warnings Makefile: Use ?= so variables can be set on command line. Fix some compatibility issues
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 11e2141..671d30d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-CFLAGS=-g -O3 -Wall -Wextra -std=c99 -Isrc $(OPTFLAGS)
-LDFLAGS=-g -O3 -Wall -Werror
-SRCDIR=src
-DATADIR=data
+CFLAGS?=-g -O3 -Wall -Wextra -std=c99 -Isrc -Wno-missing-field-initializers $(OPTFLAGS)
+LDFLAGS?=-g -O3 -Wall -Werror
+SRCDIR?=src
+DATADIR?=data
-PROG=./stmd
+PROG?=./stmd
.PHONY: all oldtests test spec benchjs testjs
all: $(SRCDIR)/case_fold_switch.inc $(PROG)
@@ -42,6 +42,7 @@ benchjs:
node js/bench.js ${BENCHINP}
HTML_OBJ=$(SRCDIR)/html/html.o $(SRCDIR)/html/houdini_href_e.o $(SRCDIR)/html/houdini_html_e.o $(SRCDIR)/html/houdini_html_u.o
+
STMD_OBJ=$(SRCDIR)/inlines.o $(SRCDIR)/buffer.o $(SRCDIR)/blocks.o $(SRCDIR)/scanners.c $(SRCDIR)/print.o $(SRCDIR)/utf8.o $(SRCDIR)/references.c
$(PROG): $(SRCDIR)/html/html_unescape.h $(SRCDIR)/case_fold_switch.inc $(HTML_OBJ) $(STMD_OBJ) $(SRCDIR)/main.c