fixes for paramodulation relocation

saturate(.opt) is now always compiled

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 88410454c48931e63cedc45ace1d735a2ba4c257..a4a6c8fd2d883ede52124480bec4dad06ac5585d 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -23,6 +23,7 @@ MODULES =                     \
        cic_unification         \
        whelp                   \
        tactics                 \
+       tactics/paramodulation \
        cic_disambiguation      \
        lexicon                 \
        grafite_engine          \
@@ -33,9 +34,9 @@ OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 OCAMLPATH = @OCAMLFIND_META_DIR@
 OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 
-METAS = $(MODULES:%=METAS/META.helm-%) METAS/META.helm-cic_disambiguation
+METAS = $(filter-out %/paramodulation,$(MODULES:%=METAS/META.helm-%))
 
-all: metas $(MODULES:%=%.all)
+all: metas $(MODULES:%=%.all) 
 opt: metas $(MODULES:%=%.opt)
 world: all opt
 metas: $(METAS)
@@ -43,6 +44,7 @@ depend: $(MODULES:%=%.depend)
 install: $(MODULES:%=%.install)
 uninstall: $(MODULES:%=%.uninstall)
 clean: $(MODULES:%=%.clean)
+
 clean_metas:
        rm -f $(METAS)
 distclean: clean clean_metas

diff --git a/helm/ocaml/tactics/paramodulation/Makefile b/helm/ocaml/tactics/paramodulation/Makefile
index af04e29c430fe0db0a82bd8a57dd959a3c01af87..8baf84c474780d42d8b5adac1e2cb369de423013 100644 (file)
--- a/helm/ocaml/tactics/paramodulation/Makefile
+++ b/helm/ocaml/tactics/paramodulation/Makefile
@@ -2,13 +2,17 @@ PACKAGE = dummy
 
 LOCALLINKOPTS = -package helm-cic_disambiguation,helm-content_pres,helm-grafite,helm-grafite_parser,helm-tactics
 
+all:saturate
+opt:saturate.opt
+
 saturate: saturate_main.ml $(LIBRARIES)
        $(OCAMLC) $(LOCALLINKOPTS) -thread -linkpkg -o $@ $<
-saturate.opt: saturate_main.ml $(PARAMOD_OBJS_OPT) $(LIBRARIES)
-       $(OCAMLOPT) $(LOCALLINKOPTS) -thread -linkpkg -o $@ $(PARAMOD_OBJS_OPT) <
+saturate.opt: saturate_main.ml $(LIBRARIES)
+       $(OCAMLOPT) $(LOCALLINKOPTS) -thread -linkpkg -o $@ $<
+
+include ../../Makefile.common
 
 clean:
-       rm saturate saturate.cmo saturate.cmx
+       rm -f saturate saturate.opt
 
-include ../../Makefile.common