From d579fcbe53997bcf8cc617341cd1da5e6d094c13 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Thu, 24 Nov 2005 08:39:51 +0000 Subject: [PATCH] removed the need of REQUIRES in libraries Makefile, they are now queried from the corresponding META --- helm/ocaml/METAS/meta.helm-cic_disambiguation.src | 2 +- helm/ocaml/METAS/meta.helm-extlib.src | 2 +- helm/ocaml/METAS/meta.helm-paramodulation.src | 2 +- helm/ocaml/Makefile.common.in | 2 +- helm/ocaml/cic/Makefile | 1 - helm/ocaml/cic_disambiguation/Makefile | 4 ---- helm/ocaml/cic_notation/Makefile | 7 ------- helm/ocaml/cic_omdoc/Makefile | 1 - helm/ocaml/cic_proof_checking/Makefile | 1 - helm/ocaml/cic_transformations/Makefile | 9 --------- helm/ocaml/cic_unification/Makefile | 1 - helm/ocaml/extlib/Makefile | 1 - helm/ocaml/getter/Makefile | 4 ---- helm/ocaml/hbugs/Makefile | 3 --- helm/ocaml/hmysql/Makefile | 1 - helm/ocaml/logger/Makefile | 1 - helm/ocaml/mathql/Makefile | 2 +- helm/ocaml/mathql_generator/Makefile | 2 -- helm/ocaml/mathql_interpreter/Makefile | 2 -- helm/ocaml/metadata/Makefile | 1 - helm/ocaml/paramodulation/Makefile | 12 ------------ helm/ocaml/registry/Makefile | 1 - helm/ocaml/tactics/Makefile | 6 ------ helm/ocaml/thread/Makefile | 1 - helm/ocaml/urimanager/Makefile | 1 - helm/ocaml/utf8_macros/Makefile | 1 - helm/ocaml/xml/Makefile | 1 - helm/ocaml/xmldiff/Makefile | 1 - 28 files changed, 5 insertions(+), 68 deletions(-) diff --git a/helm/ocaml/METAS/meta.helm-cic_disambiguation.src b/helm/ocaml/METAS/meta.helm-cic_disambiguation.src index d4c29fd78..80d468c4a 100644 --- a/helm/ocaml/METAS/meta.helm-cic_disambiguation.src +++ b/helm/ocaml/METAS/meta.helm-cic_disambiguation.src @@ -1,4 +1,4 @@ -requires="helm-tactics helm-cic_transformations" +requires="helm-tactics helm-cic_notation" version="0.0.1" archive(byte)="cic_disambiguation.cma" archive(native)="cic_disambiguation.cmxa" diff --git a/helm/ocaml/METAS/meta.helm-extlib.src b/helm/ocaml/METAS/meta.helm-extlib.src index 0bc6287de..bfee89e3d 100644 --- a/helm/ocaml/METAS/meta.helm-extlib.src +++ b/helm/ocaml/METAS/meta.helm-extlib.src @@ -1,4 +1,4 @@ -requires="unix" +requires="unix camlp4.gramlib" version="0.0.1" archive(byte)="extlib.cma" archive(native)="extlib.cmxa" diff --git a/helm/ocaml/METAS/meta.helm-paramodulation.src b/helm/ocaml/METAS/meta.helm-paramodulation.src index 57dedd068..6fe6c9898 100644 --- a/helm/ocaml/METAS/meta.helm-paramodulation.src +++ b/helm/ocaml/METAS/meta.helm-paramodulation.src @@ -1,4 +1,4 @@ -requires="helm-registry helm-cic_transformations helm-tactics helm-cic_disambiguation mysql" +requires="helm-registry helm-tactics helm-cic_disambiguation mysql" version="0.0.1" archive(byte)="paramodulation.cma" archive(native)="paramodulation.cmxa" diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in index 501a411da..af5ecab86 100644 --- a/helm/ocaml/Makefile.common.in +++ b/helm/ocaml/Makefile.common.in @@ -1,6 +1,5 @@ # This Makefile must be included by another one defining: # $PACKAGE -# $REQUIRES # $PREDICATES # $INTERFACE_FILES # $IMPLEMENTATION_FILES @@ -18,6 +17,7 @@ OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread OCAMLDEBUGOPTIONS = -g OCAMLARCHIVEOPTIONS = OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@ +REQUIRES := $(shell $(OCAMLFIND) -query -format '%(requires)' helm-$(PACKAGE)) OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS) OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS) OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4,$(REQUIRES)" $(SYNTAXOPTIONS) diff --git a/helm/ocaml/cic/Makefile b/helm/ocaml/cic/Makefile index d73177b45..a8f06e938 100644 --- a/helm/ocaml/cic/Makefile +++ b/helm/ocaml/cic/Makefile @@ -1,5 +1,4 @@ PACKAGE = cic -REQUIRES = helm-urimanager helm-xml expat PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile index 1c80b4e0a..a94d8cebc 100644 --- a/helm/ocaml/cic_disambiguation/Makefile +++ b/helm/ocaml/cic_disambiguation/Makefile @@ -1,9 +1,5 @@ PACKAGE = cic_disambiguation -REQUIRES = \ - helm-tactics helm-logger helm-cic_unification helm-cic_notation \ - helm-utf8_macros \ - ulex NOTATIONS = number INTERFACE_FILES = \ disambiguateTypes.mli \ diff --git a/helm/ocaml/cic_notation/Makefile b/helm/ocaml/cic_notation/Makefile index cfd1ad505..21c9a4e8c 100644 --- a/helm/ocaml/cic_notation/Makefile +++ b/helm/ocaml/cic_notation/Makefile @@ -1,13 +1,6 @@ PACKAGE = cic_notation NULL = -REQUIRES = \ - helm-cic \ - helm-utf8_macros \ - camlp4.gramlib \ - helm-cic_proof_checking \ - ulex \ - $(NULL) INTERFACE_FILES = \ renderingAttrs.mli \ cicNotationUtil.mli \ diff --git a/helm/ocaml/cic_omdoc/Makefile b/helm/ocaml/cic_omdoc/Makefile index 80d1d351a..f4c3b5b6f 100644 --- a/helm/ocaml/cic_omdoc/Makefile +++ b/helm/ocaml/cic_omdoc/Makefile @@ -1,5 +1,4 @@ PACKAGE = cic_omdoc -REQUIRES = helm-cic_proof_checking PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/cic_proof_checking/Makefile b/helm/ocaml/cic_proof_checking/Makefile index 352a53016..b5d1baa1a 100644 --- a/helm/ocaml/cic_proof_checking/Makefile +++ b/helm/ocaml/cic_proof_checking/Makefile @@ -1,6 +1,5 @@ PACKAGE = cic_proof_checking -REQUIRES = helm-cic helm-logger helm-getter helm-xml PREDICATES = REDUCTION_IMPLEMENTATION = cicReductionMachine.ml diff --git a/helm/ocaml/cic_transformations/Makefile b/helm/ocaml/cic_transformations/Makefile index 4a8977aa7..c5b5eaf09 100644 --- a/helm/ocaml/cic_transformations/Makefile +++ b/helm/ocaml/cic_transformations/Makefile @@ -1,13 +1,4 @@ PACKAGE = cic_transformations -REQUIRES = \ - gdome2 \ - helm-xml \ - helm-cic_proof_checking \ - helm-cic_omdoc \ - helm-registry \ - helm-utf8_macros \ - helm-cic_notation \ - $(NULL) PREDICATES = # modules which have both a .ml and a .mli diff --git a/helm/ocaml/cic_unification/Makefile b/helm/ocaml/cic_unification/Makefile index 7f1c8f351..caad67767 100644 --- a/helm/ocaml/cic_unification/Makefile +++ b/helm/ocaml/cic_unification/Makefile @@ -1,5 +1,4 @@ PACKAGE = cic_unification -REQUIRES = helm-cic_proof_checking PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/extlib/Makefile b/helm/ocaml/extlib/Makefile index c8df533ed..76370ee73 100644 --- a/helm/ocaml/extlib/Makefile +++ b/helm/ocaml/extlib/Makefile @@ -1,5 +1,4 @@ PACKAGE = extlib -REQUIRES = unix camlp4.gramlib PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/getter/Makefile b/helm/ocaml/getter/Makefile index c6450d178..9ebca237a 100644 --- a/helm/ocaml/getter/Makefile +++ b/helm/ocaml/getter/Makefile @@ -1,10 +1,6 @@ PACKAGE = getter -REQUIRES = \ - http unix pcre zip \ - helm-xml helm-logger helm-urimanager helm-registry - INTERFACE_FILES = \ http_getter_wget.mli \ http_getter_logger.mli \ diff --git a/helm/ocaml/hbugs/Makefile b/helm/ocaml/hbugs/Makefile index 542bd2e3a..c38ac3e92 100644 --- a/helm/ocaml/hbugs/Makefile +++ b/helm/ocaml/hbugs/Makefile @@ -12,9 +12,6 @@ # client -> builds hbugs client PACKAGE = hbugs -REQUIRES = \ - pcre lablgtk2.glade \ - helm-thread helm-xml helm-pxp helm-tactics helm-registry IMPLEMENTATION_FILES = \ hbugs_misc.ml \ diff --git a/helm/ocaml/hmysql/Makefile b/helm/ocaml/hmysql/Makefile index f8ae01744..2ae1d4e59 100644 --- a/helm/ocaml/hmysql/Makefile +++ b/helm/ocaml/hmysql/Makefile @@ -1,5 +1,4 @@ PACKAGE = hmysql -REQUIRES = mysql helm-registry helm-extlib PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/logger/Makefile b/helm/ocaml/logger/Makefile index 95b8c5510..dab9f5cb3 100644 --- a/helm/ocaml/logger/Makefile +++ b/helm/ocaml/logger/Makefile @@ -1,6 +1,5 @@ PACKAGE = logger -REQUIRES = INTERFACE_FILES = \ helmLogger.mli IMPLEMENTATION_FILES = \ diff --git a/helm/ocaml/mathql/Makefile b/helm/ocaml/mathql/Makefile index 203d04371..17cafb431 100644 --- a/helm/ocaml/mathql/Makefile +++ b/helm/ocaml/mathql/Makefile @@ -1,5 +1,5 @@ PACKAGE = mathql -REQUIRES = helm-cic + PREDICATES = INTERFACE_FILES = diff --git a/helm/ocaml/mathql_generator/Makefile b/helm/ocaml/mathql_generator/Makefile index a72f17ab2..cf8e820d9 100644 --- a/helm/ocaml/mathql_generator/Makefile +++ b/helm/ocaml/mathql_generator/Makefile @@ -1,7 +1,5 @@ PACKAGE = mathql_generator -REQUIRES = helm-cic helm-cic_proof_checking helm-mathql - PREDICATES = INTERFACE_FILES = mQGUtil.mli mQueryGenerator.mli \ diff --git a/helm/ocaml/mathql_interpreter/Makefile b/helm/ocaml/mathql_interpreter/Makefile index e47b37a53..bdd738135 100644 --- a/helm/ocaml/mathql_interpreter/Makefile +++ b/helm/ocaml/mathql_interpreter/Makefile @@ -1,6 +1,4 @@ PACKAGE = mathql_interpreter -REQUIRES = helm-urimanager helm-mathql mysql postgres helm-registry -#natile-galax PREDICATES = diff --git a/helm/ocaml/metadata/Makefile b/helm/ocaml/metadata/Makefile index c876b4810..29ca2d3bc 100644 --- a/helm/ocaml/metadata/Makefile +++ b/helm/ocaml/metadata/Makefile @@ -1,5 +1,4 @@ PACKAGE = metadata -REQUIRES = mysql helm-cic_proof_checking helm-hmysql PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/paramodulation/Makefile b/helm/ocaml/paramodulation/Makefile index 7a3dbf626..b65317cc2 100644 --- a/helm/ocaml/paramodulation/Makefile +++ b/helm/ocaml/paramodulation/Makefile @@ -1,12 +1,5 @@ PACKAGE = paramodulation -REQUIRES = \ - helm-registry \ - helm-cic_transformations \ - helm-tactics \ - helm-cic_disambiguation \ - mysql - INTERFACE_FILES = \ utils.mli \ inference.mli @@ -18,13 +11,8 @@ IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml) \ indexing.ml \ saturation.ml -# saturate_main.ml -# test_indexing.ml - - include ../Makefile.common - paramodulation.cmo: $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(OCAMLC) -pack -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo) diff --git a/helm/ocaml/registry/Makefile b/helm/ocaml/registry/Makefile index e92099f6e..4d3e0a52c 100644 --- a/helm/ocaml/registry/Makefile +++ b/helm/ocaml/registry/Makefile @@ -1,6 +1,5 @@ PACKAGE = registry -REQUIRES = str netstring unix helm-xml INTERFACE_FILES = helm_registry.mli IMPLEMENTATION_FILES = helm_registry.ml diff --git a/helm/ocaml/tactics/Makefile b/helm/ocaml/tactics/Makefile index 7f48873a0..88372bf04 100644 --- a/helm/ocaml/tactics/Makefile +++ b/helm/ocaml/tactics/Makefile @@ -1,10 +1,4 @@ PACKAGE = tactics -REQUIRES = \ - pcre \ - helm-cic_proof_checking \ - helm-cic_unification \ - mysql \ - helm-metadata INTERFACE_FILES = \ proofEngineTypes.mli \ diff --git a/helm/ocaml/thread/Makefile b/helm/ocaml/thread/Makefile index e39e5993c..24a96b6e9 100644 --- a/helm/ocaml/thread/Makefile +++ b/helm/ocaml/thread/Makefile @@ -1,6 +1,5 @@ PACKAGE = thread -REQUIRES = threads INTERFACE_FILES = threadSafe.mli extThread.mli IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml) diff --git a/helm/ocaml/urimanager/Makefile b/helm/ocaml/urimanager/Makefile index 8d5691aaf..afd7d4442 100644 --- a/helm/ocaml/urimanager/Makefile +++ b/helm/ocaml/urimanager/Makefile @@ -1,5 +1,4 @@ PACKAGE = urimanager -REQUIRES = str PREDICATES = INTERFACE_FILES = uriManager.mli diff --git a/helm/ocaml/utf8_macros/Makefile b/helm/ocaml/utf8_macros/Makefile index 31a1939ce..190f6cf6d 100644 --- a/helm/ocaml/utf8_macros/Makefile +++ b/helm/ocaml/utf8_macros/Makefile @@ -1,5 +1,4 @@ PACKAGE = utf8_macros -REQUIRES = PREDICATES = MAKE_TABLE_PACKAGES = helm-xml diff --git a/helm/ocaml/xml/Makefile b/helm/ocaml/xml/Makefile index fabd2dfce..6ca7bd944 100644 --- a/helm/ocaml/xml/Makefile +++ b/helm/ocaml/xml/Makefile @@ -1,5 +1,4 @@ PACKAGE = xml -REQUIRES = zip expat helm-extlib PREDICATES = INTERFACE_FILES = \ diff --git a/helm/ocaml/xmldiff/Makefile b/helm/ocaml/xmldiff/Makefile index 20a49c097..62492069e 100644 --- a/helm/ocaml/xmldiff/Makefile +++ b/helm/ocaml/xmldiff/Makefile @@ -1,5 +1,4 @@ PACKAGE = xmldiff -REQUIRES = gdome2 PREDICATES = INTERFACE_FILES = xmlDiff.mli -- 2.39.2