summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-11-06 22:39:30 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-11-06 22:39:30 -0800
commit5b2acc638ba7ee8296d9902a796bad1e7617f200 (patch)
tree760b62a161be2962bb1f62c18896ab4ae67fedfd
parent493abc5dc1952537707846294571671a4f35a6a5 (diff)
Makefile: use cmake for all, install.
-rw-r--r--Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 9b45db3..461256e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,11 @@ SPECVERSION=$(shell grep version: $(SPEC) | sed -e 's/version: *//')
.PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site
-all: $(SRCDIR)/case_fold_switch.inc $(PROG) libcommonmark.so
+all:
+ mkdir -p build; cd build; cmake ..; make
+
+install:
+ mkdir -p build; cd build; cmake ..; make install
README.html: README.md template.html
pandoc --template template.html -S -s -t html5 -o $@ $<
@@ -71,11 +75,11 @@ $(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf
ibcommonmark.so: $(HTML_OBJ) $(CMARK_OBJ)
$(CC) $(LDFLAGS) -shared -o $@ $^
-install: libcommonmark.so $(cmark_HDR) $(HTML_HDR)
- install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html
- install libcommonmark.so $(PREFIX)/lib/
- install $(cmark_HDR) $(PREFIX)/include/cmark/
- install $(HTML_HDR) $(PREFIX)/include/cmark/html/
+#install: libcommonmark.so $(cmark_HDR) $(HTML_HDR)
+# install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html
+# install libcommonmark.so $(PREFIX)/lib/
+# install $(cmark_HDR) $(PREFIX)/include/cmark/
+# install $(HTML_HDR) $(PREFIX)/include/cmark/html/
dingus: js/commonmark.js
echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000