From c6deb2fe1815c209891e1b25d8e8ecdadb901181 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 25 May 2008 21:37:41 +0200 Subject: [PATCH] Linked mop/ to the build system. CONFIG_MOP is not enabled by default yet. --- Makefile | 4 ++++ configure | 5 ++++- default.cfg | 3 +++ mop/Makefile | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mop/Makefile diff --git a/Makefile b/Makefile index a9e3572..fbae3c5 100644 --- 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 a7bfa1f..da5ad74 100755 --- 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 749fa10..22cf3e6 100644 --- 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 index 0000000..f2e4256 --- /dev/null +++ b/mop/Makefile @@ -0,0 +1,10 @@ +# Makefile for MO-P contest environment +# (c) 2008 Martin Mares + +DIRS+=mop +PROGS+=$(addprefix $(o)/mop/,md5crypt) + +$(o)/mop/md5crypt: $(o)/mop/md5crypt.o $(LIBUCW) + +CONFIGS+=mop +run/cf/mop: $(o)/mop/mop.cf -- 2.39.2