From 7df8355125c1cf660093e1ebcf8f52d15423e23e Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Wed, 12 Nov 2014 11:50:46 -0800
Subject: Re-added check to Makefile.

---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1297fc8..be45867 100644
--- a/Makefile
+++ b/Makefile
@@ -13,21 +13,24 @@ 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 check npm debug tarball
 
 all: $(BUILDDIR)
-	@cmake --build $(BUILDDIR) || (echo "You need cmake to build this program: http://www.cmake.org/download/" && exit 1)
+	@make -C $(BUILDDIR)
 
-install: $(BUILDDIR) man/man1/cmark.1
-	cmake --build $(BUILDDIR) --target install
+check:
+	@cmake --version > /dev/null || (echo "You need cmake to build this program: http://www.cmake.org/download/" && exit 1)
 
-$(BUILDDIR):
+$(BUILDDIR): check
 	mkdir -p $(BUILDDIR); \
 	cd $(BUILDDIR); \
 	cmake .. -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
 
+install: $(BUILDDIR) man/man1/cmark.1
+	make -p $(BUILDDIR) --target install
+
 debug:
 	mkdir -p $(BUILDDIR); \
 	cd $(BUILDDIR); \
 	cmake .. -DCMAKE_BUILD_TYPE=Debug; \
-	cmake --build .
+	make
 
 tarball: spec.html
 	rm -rf $(PKGDIR); \
-- 
cgit v1.2.3