X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=4b4794c36c6da95053d84dfbc5721e3db016064e;hb=8020078dd0c80b9b6680244c586c8a34c1912682;hp=3a68c0808e78039dd5d2309f8e520a2035e43b7c;hpb=54844f81bf5b6131237d3dc1a50448ea0816d091;p=eval.git

diff --git a/Makefile b/Makefile
index 3a68c08..4b4794c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for MO-Eval
-# (c) 2008 Martin Mares <mj@ucw.cz>
+# (c) 2008--2009 Martin Mares <mj@ucw.cz>
 
 VERSION=1.0.99-20080220
 
 # The default target
-all: runtree programs
+all: runtree programs datafiles configs
 
 # Include configuration
 s=.
@@ -13,16 +13,29 @@ obj/config.mk:
 	@echo "You need to run configure first." && false
 
 # 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
+TESTS=
 endif
 
 include $(s)/box/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