OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-GTOPLEVEL_MODULES = mQueryLevels mQueryGenerator
+GTOPLEVEL_MODULES = mQueryLevels2 mQueryGenerator 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: opt
+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: