From 140c015b3553aaadb89181b52630de418b31f87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <uni@thorsten-wissmann.de> Date: Tue, 14 Jan 2014 09:01:50 +0100 Subject: [PATCH] Link against ocaml graph library --- .gitignore | 3 +++ Makefile | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5ecb4c9..1eeb96d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ # executable files coalg coalgcompare + +# libraries +lib/ diff --git a/Makefile b/Makefile index 7592426..7a3cc88 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,9 @@ minisat.cmxa: minisat.cmx minisat_stub.o COALG_OBJS := minisat$(SUFFIXLIB) \ genAndComp$(SUFFIX) MiscSolver$(SUFFIX) altGenlex$(SUFFIX) HashConsing$(SUFFIX) \ ALCFormula$(SUFFIX) ALCMisc$(SUFFIX) ALCGraph$(SUFFIX) \ - CoAlgFormula$(SUFFIX) CoAlgMisc$(SUFFIX) CoAlgLogics$(SUFFIX) CoAlgReasoner$(SUFFIX) + CoAlgFormula$(SUFFIX) CoAlgMisc$(SUFFIX) CoAlgLogics$(SUFFIX) \ + CoAlgReasoner$(SUFFIX) \ + lib/ocamlgraph-1.8.3/graph$(SUFFIX) coalg: $(COALG_OBJS) coalg$(SUFFIX) $(OC) -o coalg $(FLAGS) $(LIBS) $^ @@ -99,6 +101,22 @@ clean: $(RM) -f .depend $(RM) -f $(PROGS) $(RM) -f *.a + $(RM) -rf lib/ + +GRAPHLIBTAR := lib/ocamlgraph-1.8.3.tar.gz + +$(GRAPHLIBTAR): + mkdir -p lib/ + wget -O $@ http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.3.tar.gz + +lib/ocamlgraph-1.8.3/src/graphml.ml: $(GRAPHLIBTAR) + tar xf $(GRAPHLIBTAR) -C lib/ + touch $@ + + +lib/ocamlgraph-1.8.3/graph$(SUFFIX): lib/ocamlgraph-1.8.3/src/graphml.ml + cd lib/ocamlgraph-1.8.3/ ; ./configure + make -C lib/ocamlgraph-1.8.3/ .PHONY: depend -- GitLab