From 5b2acc638ba7ee8296d9902a796bad1e7617f200 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 6 Nov 2014 22:39:30 -0800
Subject: Makefile:  use cmake for all, install.

---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3