Moved everything related to MO-P to mop/. This cleans up bin/.

[moe.git] / Makefile

diff --git a/Makefile b/Makefile
index 8598a419f807bd162b0ec7c2156bf44cd41e8e48..af3658aba8866caf73a14fe0a512d2b56305f094 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,29 @@
-# 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
 
-# Comment out if you are using a recent gcc
-CFLAGS+=-Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers
+# The default target
+all: runtree programs datafiles
 
-# Comment out if you do not wish to build remote submit utilities
-SUBMIT=submit
-LIBUCW:=$(shell cd ../holmes-libs-3.12/run && pwd)
+# Include configuration
+s=.
+-include obj/config.mk
+obj/config.mk:
+       @echo "You need to run configure first." && false
 
-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
-
-submit:
-
-clean::
-       rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core`
-       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
 endif
 
-.PHONY: all clean distclean submit
+include $(s)/box/Makefile
+include $(s)/utils/Makefile
+include $(s)/eval/Makefile
+
+# And finally the default rules of the build system
+include $(s)/build/Makebottom