mathql query generator interface patched

[helm.git] / helm / searchEngine / Makefile

diff --git a/helm/searchEngine/Makefile b/helm/searchEngine/Makefile
index 7be42086c9636999ec74cff340d11d915defb012..a2287e77d1005763c5e5dd72c99c7d36f040e9b9 100644 (file)
--- a/helm/searchEngine/Makefile
+++ b/helm/searchEngine/Makefile
@@ -1,20 +1,25 @@
 REQUIRES = http helm-cic_textual_parser helm-cic_proof_checking \
            helm-xml gdome2-xslt helm-cic_unification helm-mathql \
-           helm-mathql_interpreter
-OCAMLOPTIONS = -package "$(REQUIRES)" -pp camlp4o -I ../gTopLevel -thread
+           helm-mathql_interpreter helm-mathql_generator netclient
+OCAMLOPTIONS = -package "$(REQUIRES)" -pp camlp4o -I ../gTopLevel
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
 
-GTOPLEVEL_MODULES = mQueryLevels mQueryGenerator
+GTOPLEVEL_MODULES = disambiguate
+MODULES =
+CMOS = $(patsubst %,%.cmo,$(MODULES))
+CMXS = $(patsubst %,%.cmx,$(MODULES))
 LIBRARIES =    $(patsubst %,../gTopLevel/%.cmo,$(GTOPLEVEL_MODULES))
 LIBRARIES_OPT =        $(patsubst %,../gTopLevel/%.cmx,$(GTOPLEVEL_MODULES))
 
-all: searchEngine
+all: byte
+world: byte opt
+byte: searchEngine
 opt: searchEngine.opt
 
-searchEngine: $(LIBRARIES) searchEngine.ml
+searchEngine: $(LIBRARIES) $(CMOS) searchEngine.ml
        $(OCAMLC) -linkpkg -o $@ $^
-searchEngine.opt: $(LIBRARIES_OPT) searchEngine.ml
+searchEngine.opt: $(LIBRARIES_OPT) $(CMXS) searchEngine.ml
        $(OCAMLOPT) -linkpkg -o $@ $^
 
 clean: