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

diff --git a/Makefile b/Makefile
index 226437e..4b4794c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for MO-Eval
-# (c) 2008 Martin Mares <mj@ucw.cz>
+# (c) 2008--2009 Martin Mares <mj@ucw.cz>
 
 VERSION=1.0.99-20080220
 
@@ -13,11 +13,12 @@ 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=
@@ -27,7 +28,14 @@ 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