removed .cvswrappers

[helm.git] / helm / uwobo / src / ocaml / Makefile

diff --git a/helm/uwobo/src/ocaml/Makefile b/helm/uwobo/src/ocaml/Makefile
index 4c5f463f9b84630efccd025ac5cca6bdf18f59a9..c586dba2c68309772f13221f016c6ee11baef78a 100644 (file)
--- a/helm/uwobo/src/ocaml/Makefile
+++ b/helm/uwobo/src/ocaml/Makefile
@@ -1,15 +1,23 @@
 VERSION = 0.0.1
 DISTDIR = uwobo-$(VERSION)
-REQUIRES = http gdome2 gdome2-xslt pcre unix threads
+REQUIRES = http gdome2 gdome2-xslt pcre unix
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(COMMONOPTS)
-OCAMLOPT = ocamlfind ocamlopt $(COMMONOPTS)
-OCAMLDEP = ocamlfind ocamldep $(COMMONOPTS)
+OCAMLFIND = ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMONOPTS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)
+OCAMLDOC =     \
+       ocamldoc        \
+               $(shell $(OCAMLFIND) query -i-format http)      \
+               $(shell $(OCAMLFIND) query -i-format gdome2)    \
+               $(shell $(OCAMLFIND) query -i-format gdome2-xslt)       \
+               $(shell $(OCAMLFIND) query -i-format pcre)      \
+               $(shell $(OCAMLFIND) query -i-format unix)
 MODULES = uwobo_common uwobo_styles uwobo_logger uwobo_engine
 OBJS = $(patsubst %,%.cmo,$(MODULES))
 OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
 
-all: world
+all: byte
 byte: uwobo
 opt: uwobo.opt
 world: byte opt
@@ -29,13 +37,16 @@ uwobo.cmo: uwobo.ml
 uwobo.cmx: uwobo.ml
        $(OCAMLOPT) -c $<
 uwobo: $(OBJS) uwobo.ml
-       $(OCAMLC) -linkpkg -thread -o $@ $^
+       $(OCAMLC) -linkpkg -o $@ $^
 uwobo.opt: $(OBJSOPT) uwobo.ml
-       $(OCAMLOPT) -linkpkg -thread -o $@ $^
+       $(OCAMLOPT) -linkpkg -o $@ $^
+
+uwobo.dot: *.ml *.mli
+       $(OCAMLDOC) -dot -o $@ $^
 
 distclean: clean
 clean:
-       rm -f *.cm[aiox] *.o uwobo{,.opt}
+       rm -f *.cm[aiox] *.o uwobo{,.opt,.dot}
 dist: distclean depend
        mkdir $(DISTDIR)/
        cp      \