mo-score: Since STDOUT may be a pipe, we need to close it

[moe.git] / Makefile

diff --git a/Makefile b/Makefile
index 79a1193d1cdf41cdb6bd2a6d19cbdb3ced0bd7b2..4b4794c36c6da95053d84dfbc5721e3db016064e 100644 (file)
--- 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 datafiles
+all: runtree programs datafiles configs
 
 # Include configuration
 s=.
@@ -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=
@@ -28,5 +29,13 @@ 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