X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=Makefile;h=9adae4062025283cc9dceb10ba71c10dc896d89b;hb=4c4549c822cca499e0815170c41587badb6b2a0f;hp=fbae3c538d28498d8c0240ee449af17dccca1816;hpb=c6deb2fe1815c209891e1b25d8e8ecdadb901181;p=eval.git

diff --git a/Makefile b/Makefile
index fbae3c5..9adae40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-# Makefile for MO-Eval
-# (c) 2008 Martin Mares <mj@ucw.cz>
+# Makefile for Moe
+# (c) 2008--2012 Martin Mares <mj@ucw.cz>
 
-VERSION=1.0.99-20080220
+VERSION=2.0
+SHELL=/bin/bash
 
 # The default target
-all: runtree programs datafiles configs
+all:: runtree programs datafiles configs
 
 # Include configuration
 s=.
@@ -12,18 +13,26 @@ s=.
 obj/config.mk:
 	@echo "You need to run configure first." && false
 
+ifdef CONFIG_DOC
+all:: docs
+endif
+
 # We will use the libucw build system
-include $(s)/build/Maketop
+BUILDSYS=$(s)/build
+include $(BUILDSYS)/Maketop
 
 # Include makefiles of libraries we wish to use
 ifdef CONFIG_UCW_LIBS
-include $(s)/lib/Makefile
+include $(s)/ucw/Makefile
 include $(s)/sherlock/Makefile
-# Disable built-in tests of these libraries
+# Disable built-in tests and documentation of these libraries
 TESTS=
+DOCS=
+DOC_INDICES=
 endif
 
 include $(s)/box/Makefile
+include $(s)/isolate/Makefile
 include $(s)/utils/Makefile
 include $(s)/eval/Makefile
 include $(s)/judge/Makefile
@@ -37,4 +46,4 @@ include $(s)/mop/Makefile
 endif
 
 # And finally the default rules of the build system
-include $(s)/build/Makebottom
+include $(BUILDSYS)/Makebottom