Linked mop/ to the build system.

CONFIG_MOP is not enabled by default yet.

diff --git a/Makefile b/Makefile
index a9e357236156d0376d251390e1f3ee4b2876377e..fbae3c538d28498d8c0240ee449af17dccca1816 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,5 +32,9 @@ 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

diff --git a/configure b/configure
index a7bfa1f6885eb7797b66d7e7f69c1cac83ef9e99..da5ad74b797dd16b3564601aa6f952cc32ed7d0a 100755 (executable)
--- a/configure
+++ b/configure
@@ -27,7 +27,10 @@ Log "### Configuring MO-Eval ###\n\n";
 Include Get("CONFIG");
 Include "lib/autoconf.cfg";
 
-Set("CONFIG_UCW_LIBS" => 1);
+if (Get("CONFIG_SUBMIT") || Get("CONFIG_MOP")) {
+       # Build libucw only if it is needed
+       Set("CONFIG_UCW_LIBS" => 1);
+}
 
 Finish();
 Log "\nConfigured, run `make' to build everything.\n";

diff --git a/default.cfg b/default.cfg
index 749fa103533377ea45a48c4c00e177bf2545b57d..22cf3e68d0d7b018904aa4a733f931a786ff0d79 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -3,6 +3,9 @@
 # Compile the submit server
 Set("CONFIG_SUBMIT" => 1);
 
+# Build MO-P contest environment
+#Set("CONFIG_MOP" => 1);
+
 # Settings of libucw
 UnSet("CONFIG_SHARED");
 UnSet("CONFIG_UCW_THREADS");

diff --git a/mop/Makefile b/mop/Makefile
new file mode 100644 (file)
index 0000000..f2e4256
--- /dev/null
+++ b/mop/Makefile
@@ -0,0 +1,10 @@
+# Makefile for MO-P contest environment
+# (c) 2008 Martin Mares <mj@ucw.cz>
+
+DIRS+=mop
+PROGS+=$(addprefix $(o)/mop/,md5crypt)
+
+$(o)/mop/md5crypt: $(o)/mop/md5crypt.o $(LIBUCW)
+
+CONFIGS+=mop
+run/cf/mop: $(o)/mop/mop.cf