Distinguish between die() and err().

[moe.git] / Makefile

diff --git a/Makefile b/Makefile
index 9f830512f7e1f8a3fe6152d6a99d19e2e580a861..fbae3c538d28498d8c0240ee449af17dccca1816 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 VERSION=1.0.99-20080220
 
 # The default target
-all: runtree programs
+all: runtree programs datafiles configs
 
 # Include configuration
 s=.
@@ -19,11 +19,22 @@ include $(s)/build/Maketop
 ifdef CONFIG_UCW_LIBS
 include $(s)/lib/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