From ed82731e63f8779c12f705ff3ac0f684872b96c9 Mon Sep 17 00:00:00 2001 From: GrĂ©goire DuchĂȘne Date: Mon, 1 Sep 2014 18:34:32 +0200 Subject: Simplified some conditionals --- gnu.ocaml.prog.mk | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'gnu.ocaml.prog.mk') diff --git a/gnu.ocaml.prog.mk b/gnu.ocaml.prog.mk index 668dee1..77d211d 100644 --- a/gnu.ocaml.prog.mk +++ b/gnu.ocaml.prog.mk @@ -16,6 +16,16 @@ include $(dir $(lastword $(MAKEFILE_LIST)))gnu.ocaml.rules.mk +DEPFILE?= .Makefile.dep +PROG?= a.out +SRC+= $(CSRC) + +ifdef CSRC +ifndef OCAMLNATIVE +OCAMLFLAGS+= -custom +endif +endif + ifndef OCAMLC ifdef OCAMLNATIVE OCAMLC= ocamlfind ocamlopt @@ -30,26 +40,8 @@ endif OCAMLFLAGS+= $(DEBUG) -ifndef PROG -PROG= a.out -endif - -all: ${PROG} - -SRC+= $(CSRC) - -ifndef DEPFILE -DEPFILE= .Makefile.dep -endif - -include $(DEPFILE) -ifdef CSRC -ifndef OCAMLNATIVE -OCAMLFLAGS+= -custom -endif -endif - OBJ+= $(patsubst %.c, %.o, $(filter %.c, $(SRC))) ifdef OCAMLNATIVE @@ -61,6 +53,7 @@ OBJ+= $(patsubst %.ml, %.cmo, $(filter %.ml, $(SRC))) CLEAN+= $(patsubst %.cmo, %.cmi, $(OBJ)) endif +all: ${PROG} $(PROG): $(OBJ) $(OCAMLC) $(OCAMLFLAGS) -o $@ $^ clean: -- cgit v1.2.3-70-g09d2