Makefile.common.in and .depend backtracked to my last commit (before the

[helm.git] / helm / gTopLevel / Makefile

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 5f630f23c7f05187b48fab150a397304fad33b88..7822b1ace7d0fa5accc5b68359a0540551c605f7 100644 (file)
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -4,7 +4,6 @@ REQUIRES = lablgtkmathview helm-cic_textual_parser helm-cic_proof_checking \
            helm-mathql_interpreter
 PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLDEPOPTIONS = $(shell ocamlfind query -recursive -predicates "$(PREDICATES)" -i-format $(REQUIRES))
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
@@ -34,7 +33,7 @@ TOPLEVELOBJS = \
         gTopLevel.cmo
 
 depend:
-       $(OCAMLDEP) $(OCAMLDEPOPTIONS) $(DEPOBJS) > .depend
+       $(OCAMLDEP) $(DEPOBJS) > .depend
 
 gTopLevel: $(TOPLEVELOBJS) $(LIBRARIES)
        $(OCAMLC) -linkpkg -o gTopLevel $(TOPLEVELOBJS)
@@ -43,13 +42,16 @@ gTopLevel.opt: $(TOPLEVELOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o gTopLevel.opt $(TOPLEVELOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo: $(LIBRARIES)
+.ml.cmo:
        $(OCAMLC) -c $<
-.mli.cmi: $(LIBRARIES)
+.mli.cmi:
        $(OCAMLC) -c $<
-.ml.cmx: $(LIBRARIES_OPT)
+.ml.cmx:
        $(OCAMLOPT) -c $<
 
+$(TOPLEVELOBJS): $(LIBRARIES)
+$(TOPLEVELOBJS:.cmo=.cmx)): $(LIBRARIES_OPT)
+
 clean:
        rm -f *.cm[iox] *.o gTopLevel gTopLevel.opt