X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=9adae4062025283cc9dceb10ba71c10dc896d89b;hb=9fcd780fa33e62f56e9449837fdcbbb223e28d6c;hp=226437e9869a679280442dff27583c17a39e1bb0;hpb=5df9d386bdbb242b44f055b3db02e145260db073;p=moe.git

diff --git a/Makefile b/Makefile
index 226437e..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,22 +13,37 @@ 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
+
+ifdef CONFIG_SUBMIT
 include $(s)/submit/Makefile
+endif
+
+ifdef CONFIG_MOP
+include $(s)/mop/Makefile
+endif
 
 # And finally the default rules of the build system
-include $(s)/build/Makebottom
+include $(BUILDSYS)/Makebottom