X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fgraphs%2Ftools%2FMakefile;h=1d945f8fd66e8abb350a93cf26df7be76b0606fd;hb=9f60b3b0f4460aec52ec241037f6c475b421dd15;hp=8246a81dac6bcc5a28e1db80efda4b0bd156bbd4;hpb=4c67cc0208078e3952a5146563d4d49116f7edf4;p=helm.git

diff --git a/helm/graphs/tools/Makefile b/helm/graphs/tools/Makefile
index 8246a81da..1d945f8fd 100644
--- a/helm/graphs/tools/Makefile
+++ b/helm/graphs/tools/Makefile
@@ -1,17 +1,29 @@
 PID=
-DOT=../gv1.7c/bin/dot
-SED=sed "s/font-family:Times;//g"
+DOT=dot
+#SED=sed "s/font-family:Times;//g"
+SED=cat
 
 REQUIRES = http
-PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+PREDICATES = mt
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+EXECUTABLES = uriSetQueue drawGraph
+EXECUTABLES_OPT = $(patsubst %,%.opt,$(EXECUTABLES))
 
 #OBJS=prova.$(PID).svg prova.$(PID).ps prova.$(PID).gif prova.$(PID).ismap prova.$(PID).imap prova.$(PID).html
 OBJS=prova.$(PID).gif prova.$(PID).ismap prova.$(PID).html
 
-all: $(OBJS)
+all: $(EXECUTABLES)
+opt: $(EXECUTABLES_OPT)
+world: all opt
+clean:
+	rm -f *.cm[aiox] *.cmxa *.[ao] $(EXECUTABLES) $(EXECUTABLES_OPT)
+
+tmp: $(OBJS)
+clean_tmp:
+	rm -f $(OBJS) prova.$(PID).dot xx.$(PID)00 xx.$(PID)01 xx.$(PID)02 \
+		xx.$(PID)02n xx.$(PID)03 log.$(PID)
 
 uriSetQueue: uriSetQueue.ml
 	$(OCAMLC) -linkpkg -o $@ $<
@@ -19,9 +31,9 @@ uriSetQueue.opt: uriSetQueue.ml
 	$(OCAMLOPT) -linkpkg -o $@ $<
 
 drawGraph: drawGraph.ml
-	$(OCAMLC) -package "unix netclient" -linkpkg -o $@ $<
+	$(OCAMLC) -linkpkg -o $@ $<
 drawGraph.opt: drawGraph.ml
-	$(OCAMLOPT) -package "unix netclient" -linkpkg -o $@ $<
+	$(OCAMLOPT) -linkpkg -o $@ $<
 
 prova.$(PID).dot: prova0.$(PID).dot
 	csplit --prefix=xx.$(PID) prova0.$(PID).dot 1 2 `expr \`wc -l prova0.$(PID).dot | sed 's/\([0123456789]\+\) prova0.$(PID).dot/\1/'\` + 1`
@@ -46,5 +58,3 @@ prova.$(PID).ismap: prova.$(PID).dot
 prova.$(PID).html: prova.$(PID).ismap
 	cat xx.$(PID)00 prova.$(PID).ismap | ./mk_html.pl $(PID) > prova.$(PID).html
 
-clean:
-	rm -f $(OBJS) prova.$(PID).dot xx.$(PID)00 xx.$(PID)01 xx.$(PID)02 xx.$(PID)02n xx.$(PID)03 log.$(PID)