From 2d34b1e2e0238680e8e14d3edfd562b721fc294f Mon Sep 17 00:00:00 2001 From: John Else Date: Sat, 7 Nov 2015 11:37:43 +0000 Subject: [PATCH] Revert to old Makefile Signed-off-by: John Else --- Makefile | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 950209c..ef71ed3 100644 --- a/Makefile +++ b/Makefile @@ -1,58 +1,44 @@ +all: build + ocamlfind_check=$(shell ocamlfind query $(1) > /dev/null 2> /dev/null && echo "true") LWT=$(call ocamlfind_check,lwt) ifeq ($(LWT), true) - LWTFLAG=--enable-lwt + LWT_FLAG=--enable-lwt endif -CONFIGUREFLAGS=--enable-unix --enable-tests $(LWTFLAG) -BUILDFLAGS=-j 4 -DOCFLAGS=-j 4 +UNIX_FLAG=--enable-unix -NAME=osc +TESTS_FLAG=--enable-tests -# ################################### -# ################################### +NAME=osc +J=4 -SETUP = ocaml setup.ml +setup.data: setup.ml + ocaml setup.ml -configure $(LWT_FLAG) $(UNIX_FLAG) $(TESTS_FLAG) build: setup.data - $(SETUP) -build $(BUILDFLAGS) - -doc: setup.data build - $(SETUP) -doc $(DOCFLAGS) - -test: setup.data build - $(SETUP) -test $(TESTFLAGS) + ocaml setup.ml -build -j $(J) -all: - $(SETUP) -all $(ALLFLAGS) +doc: setup.data + ocaml setup.ml -doc -j $(J) install: setup.data - $(SETUP) -install $(INSTALLFLAGS) + ocaml setup.ml -install uninstall: ocamlfind remove $(NAME) reinstall: setup.data ocamlfind remove $(NAME) || true - $(SETUP) -reinstall $(REINSTALLFLAGS) + ocaml setup.ml -reinstall clean: - $(SETUP) -clean $(CLEANFLAGS) - -distclean: - $(SETUP) -distclean $(DISTCLEANFLAGS) - -setup.data: - $(SETUP) -configure $(CONFIGUREFLAGS) - -configure: - $(SETUP) -configure $(CONFIGUREFLAGS) - -.PHONY: build doc test all install uninstall reinstall clean distclean configure + ocamlbuild -clean + rm -f setup.data setup.log test.data -# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954) +test: build + ocaml setup.ml -test test-interop-sclang: build ./test-interop-sclang.sh