Isolate: Support for multiple sandboxes

[eval.git] / Makefile

diff --git a/Makefile b/Makefile
index fbae3c538d28498d8c0240ee449af17dccca1816..9480ae52e689f9fd3c83b391cbfc6e2b2250ef0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for MO-Eval
 # Makefile for MO-Eval

-# (c) 2008 Martin Mares <mj@ucw.cz>
+# (c) 2008--2009 Martin Mares <mj@ucw.cz>

 
 VERSION=1.0.99-20080220
 
 
 VERSION=1.0.99-20080220
 


@@ -13,17 +13,19 @@ obj/config.mk:
        @echo "You need to run configure first." && false
 
 # We will use the libucw build system
        @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 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=
 endif
 
 include $(s)/box/Makefile
 include $(s)/sherlock/Makefile
 # Disable built-in tests of these libraries
 TESTS=
 endif
 
 include $(s)/box/Makefile

+include $(s)/isolate/Makefile

 include $(s)/utils/Makefile
 include $(s)/eval/Makefile
 include $(s)/judge/Makefile
 include $(s)/utils/Makefile
 include $(s)/eval/Makefile
 include $(s)/judge/Makefile


@@ -37,4 +39,4 @@ include $(s)/mop/Makefile
 endif
 
 # And finally the default rules of the build system
 endif
 
 # And finally the default rules of the build system

-include $(s)/build/Makebottom
+include $(BUILDSYS)/Makebottom