X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=4b4794c36c6da95053d84dfbc5721e3db016064e;hb=b07a7c4bf08db2928e1845c4e60798f7c9ad8b65;hp=9f830512f7e1f8a3fe6152d6a99d19e2e580a861;hpb=935a72a30026497d0524b3e7f1f8f379eab23b6b;p=moe.git

diff --git a/Makefile b/Makefile
index 9f83051..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,17 +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
 
-# Programs we want to compile
-#PROGS+=$(o)/test
-#$(o)/test: $(o)/test.o $(LIBUCW) $(LIBLANG) $(LIBCHARSET) $(LIBIMAGES)
+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