aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-11-12 11:50:46 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-11-12 11:52:23 -0800
commit7df8355125c1cf660093e1ebcf8f52d15423e23e (patch)
treef8239ef1621b7b13fabb9cf289eb79b6be17f553
parent2145ef0fe27f1db9a2e6d981df996298d94fbdae (diff)
Re-added check to Makefile.
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
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); \