X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=e183f4c8be3b89bb2f60ba4320091b3ea1bec947;hb=65517c0cd75d3c846d8e8304c414e9d63d155ecc;hp=8c13b71d2fe976fc9836bf1126403f55de715653;hpb=51e23ac98d6eea877f5d1c71663e35151b3f2059;p=moe.git

diff --git a/Makefile b/Makefile
index 8c13b71..e183f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,33 @@
-# Makefile for mo-eval and related utilities
-# (c) 2007 Martin Mares <mj@ucw.cz>
+# Makefile for MO-Eval
+# (c) 2008 Martin Mares <mj@ucw.cz>
 
-VERSION=1.0.1
-#DEBUG=-ggdb
-CFLAGS=-O2 -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wredundant-decls -Winline $(DEBUG) -std=gnu99
+VERSION=1.0.99-20080220
 
-#CC=gcc-4.1.1
+# The default target
+all: runtree programs datafiles
 
-# Comment out if you are using a recent gcc
-CFLAGS+=-Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers
+# Include configuration
+s=.
+-include obj/config.mk
+obj/config.mk:
+	@echo "You need to run configure first." && false
 
-# Comment out if you do not wish to build remote submit utilities
-#SUBMIT=submit
-#LIBUCW:=$(shell cd ../holmes-libs-3.12/run && pwd)
-
-export LIBUCW CFLAGS LDFLAGS DEBUG
-
-all: bin/box bin/iwrapper bin/md5crypt bin/pedant $(SUBMIT)
-
-bin/%: src/%.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-bin/box: src/box.o
-bin/iwrapper: src/iwrapper.o
-bin/md5crypt: src/md5crypt.o src/md5.o
-bin/pedant: src/pedant.o
-
-src/box.o: src/box.c src/syscall-table.h
-
-src/syscall-table.h:
-	src/mk-syscall-table
-
-submit:
-
-clean::
-	rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core`
-	rm -f src/syscall-table.h
-	rm -f bin/box bin/iwrapper bin/md5crypt bin/pedant
-
-distclean: clean
-
-ifdef SUBMIT
-
-submit:
-	$(MAKE) -C submit
-
-clean::
-	$(MAKE) -C submit clean
+# We will use the libucw build system
+include $(s)/build/Maketop
 
+# Include makefiles of libraries we wish to use
+ifdef CONFIG_UCW_LIBS
+include $(s)/lib/Makefile
+include $(s)/sherlock/Makefile
+# Disable built-in tests of these libraries
+TESTS=
 endif
 
-.PHONY: all clean distclean submit
+include $(s)/box/Makefile
+include $(s)/utils/Makefile
+include $(s)/eval/Makefile
+include $(s)/judge/Makefile
+include $(s)/submit/Makefile
+
+# And finally the default rules of the build system
+include $(s)/build/Makebottom