moved META files in METAS/ dir

diff --git a/helm/ocaml/.cvsignore b/helm/ocaml/.cvsignore
index 5d79f6bc0b7e5b05f1baf51c83b5f88cc90f5edb..89abd8c992e2d2afa177b70e35ff2ee38d8bfe02 100644 (file)
--- a/helm/ocaml/.cvsignore
+++ b/helm/ocaml/.cvsignore
@@ -1,23 +1,3 @@
-META.helm-cic
-META.helm-cic_annotations
-META.helm-cic_annotations_cache
-META.helm-cic_cache
-META.helm-cic_proof_checking
-META.helm-tex_cic_textual_parser
-META.helm-cic_textual_parser
-META.helm-cic_textual_parser2
-META.helm-cic_unification
-META.helm-getter
-META.helm-mathql
-META.helm-mathql_interpreter
-META.helm-mathql_test
-META.helm-mathql_generator
-META.helm-pxp
-META.helm-tactics
-META.helm-urimanager
-META.helm-xml
-META.helm-cic_transformations
-META.helm-cic_omdoc
 Makefile
 Makefile.common
 autom4te.cache

diff --git a/helm/ocaml/META.helm-cic.src b/helm/ocaml/META.helm-cic.src
deleted file mode 100644 (file)
index ee898d8..0000000
--- a/helm/ocaml/META.helm-cic.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-urimanager helm-pxp"
-version="0.0.1"
-archive(byte)="cic.cma"
-archive(native)="cic.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_annotations.src b/helm/ocaml/META.helm-cic_annotations.src
deleted file mode 100644 (file)
index 829efba..0000000
--- a/helm/ocaml/META.helm-cic_annotations.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic helm-xml"
-version="0.0.1"
-archive(byte)="cic_annotations.cma"
-archive(native)="cic_annotations.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_annotations_cache.src b/helm/ocaml/META.helm-cic_annotations_cache.src
deleted file mode 100644 (file)
index 38f5d1d..0000000
--- a/helm/ocaml/META.helm-cic_annotations_cache.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic_annotations"
-version="0.0.1"
-archive(byte)="cic_annotations_cache.cma"
-archive(native)="cic_annotations_cache.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_cache.src b/helm/ocaml/META.helm-cic_cache.src
deleted file mode 100644 (file)
index 28ea57e..0000000
--- a/helm/ocaml/META.helm-cic_cache.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic"
-version="0.0.1"
-archive(byte)="cic_cache.cma"
-archive(native)="cic_cache.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_omdoc.src b/helm/ocaml/META.helm-cic_omdoc.src
deleted file mode 100644 (file)
index e05ddfc..0000000
--- a/helm/ocaml/META.helm-cic_omdoc.src
+++ /dev/null
@@ -1,4 +0,0 @@
-requires="helm-cic_proof_checking helm-mathql_interpreter"
-version="0.0.1"
-archive(byte)="cic_omdoc.cma"
-archive(native)="cic_omdoc.cmxa"

diff --git a/helm/ocaml/META.helm-cic_proof_checking.src b/helm/ocaml/META.helm-cic_proof_checking.src
deleted file mode 100644 (file)
index 08b099e..0000000
--- a/helm/ocaml/META.helm-cic_proof_checking.src
+++ /dev/null
@@ -1,7 +0,0 @@
-requires="helm-cic"
-version="0.0.1"
-archive(byte)="cic_proof_checking.cma"
-archive(native)="cic_proof_checking.cmxa"
-archive(byte,miniReduction)="cicSubstitution.cmo cicMiniReduction.cmo"
-archive(native,miniReduction)="cicSubstitution.cmx cicMiniReduction.cmx"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_textual_parser.src b/helm/ocaml/META.helm-cic_textual_parser.src
deleted file mode 100644 (file)
index bc4f2fc..0000000
--- a/helm/ocaml/META.helm-cic_textual_parser.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic"
-version="0.0.1"
-archive(byte)="cic_textual_parser.cma"
-archive(native)="cic_textual_parser.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_textual_parser2.src b/helm/ocaml/META.helm-cic_textual_parser2.src
deleted file mode 100644 (file)
index 043a289..0000000
--- a/helm/ocaml/META.helm-cic_textual_parser2.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic"
-version="0.0.1"
-archive(byte)="cic_textual_parser2.cma"
-archive(native)="cic_textual_parser2.cmxa"
-linkopts="-I +camlp4 gramlib.cma"

diff --git a/helm/ocaml/META.helm-cic_transformations.src b/helm/ocaml/META.helm-cic_transformations.src
deleted file mode 100644 (file)
index 44bb099..0000000
--- a/helm/ocaml/META.helm-cic_transformations.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-xml helm-cic_proof_checking helm-cic_omdoc gdome2-xslt"
-version="0.0.1"
-archive(byte)="cic_transformations.cma"
-archive(native)="cic_transformations.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-cic_unification.src b/helm/ocaml/META.helm-cic_unification.src
deleted file mode 100644 (file)
index 6cb775d..0000000
--- a/helm/ocaml/META.helm-cic_unification.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic_proof_checking"
-version="0.0.1"
-archive(byte)="cic_unification.cma"
-archive(native)="cic_unification.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-getter.src b/helm/ocaml/META.helm-getter.src
deleted file mode 100644 (file)
index 8ba941f..0000000
--- a/helm/ocaml/META.helm-getter.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-urimanager pxp netclient"
-version="0.0.1"
-archive(byte)="getter.cma"
-archive(native)="getter.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-mathql.src b/helm/ocaml/META.helm-mathql.src
deleted file mode 100644 (file)
index df553d7..0000000
--- a/helm/ocaml/META.helm-mathql.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-urimanager"
-version="1.3"
-archive(byte)="mathql.cma"
-archive(native)="mathql.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-mathql_generator.src b/helm/ocaml/META.helm-mathql_generator.src
deleted file mode 100644 (file)
index c416820..0000000
--- a/helm/ocaml/META.helm-mathql_generator.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic helm-cic_proof_checking helm-mathql"
-version="1.3"
-archive(byte)="mathql_generator.cma"
-archive(native)="mathql_generator.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-mathql_interpreter.src b/helm/ocaml/META.helm-mathql_interpreter.src
deleted file mode 100644 (file)
index 24a1929..0000000
--- a/helm/ocaml/META.helm-mathql_interpreter.src
+++ /dev/null
@@ -1,6 +0,0 @@
-requires="helm-cic helm-cic_textual_parser postgres helm-mathql"
-#natile-galax 
-version="1.3"
-archive(byte)="mathql_interpreter.cma"
-archive(native)="mathql_interpreter.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-pxp.src b/helm/ocaml/META.helm-pxp.src
deleted file mode 100644 (file)
index 33210a7..0000000
--- a/helm/ocaml/META.helm-pxp.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-getter"
-version="0.0.1"
-archive(byte)="pxp.cma"
-archive(native)="pxp.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-tactics.src b/helm/ocaml/META.helm-tactics.src
deleted file mode 100644 (file)
index cffd94f..0000000
--- a/helm/ocaml/META.helm-tactics.src
+++ /dev/null
@@ -1,4 +0,0 @@
-requires="helm-cic_textual_parser helm-cic_proof_checking helm-cic_unification helm-mathql_generator"
-version="0.0.1"
-archive(byte)="tactics.cma"
-archive(native)="tactics.cmxa"

diff --git a/helm/ocaml/META.helm-tex_cic_textual_parser.src b/helm/ocaml/META.helm-tex_cic_textual_parser.src
deleted file mode 100644 (file)
index dec21ee..0000000
--- a/helm/ocaml/META.helm-tex_cic_textual_parser.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="helm-cic"
-version="0.0.1"
-archive(byte)="tex_cic_textual_parser.cma"
-archive(native)="tex_cic_textual_parser.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-urimanager.src b/helm/ocaml/META.helm-urimanager.src
deleted file mode 100644 (file)
index ff18746..0000000
--- a/helm/ocaml/META.helm-urimanager.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires="str"
-version="0.0.1"
-archive(byte)="urimanager.cma"
-archive(native)="urimanager.cmxa"
-linkopts=""

diff --git a/helm/ocaml/META.helm-xml.src b/helm/ocaml/META.helm-xml.src
deleted file mode 100644 (file)
index 1cd68fe..0000000
--- a/helm/ocaml/META.helm-xml.src
+++ /dev/null
@@ -1,5 +0,0 @@
-requires=""
-version="0.0.1"
-archive(byte)="xml.cma"
-archive(native)="xml.cmxa"
-linkopts=""

diff --git a/helm/ocaml/METAS/.cvsignore b/helm/ocaml/METAS/.cvsignore
new file mode 100644 (file)
index 0000000..e9a5976
--- /dev/null
+++ b/helm/ocaml/METAS/.cvsignore
@@ -0,0 +1,20 @@
+META.helm-cic
+META.helm-cic_annotations
+META.helm-cic_annotations_cache
+META.helm-cic_cache
+META.helm-cic_proof_checking
+META.helm-tex_cic_textual_parser
+META.helm-cic_textual_parser
+META.helm-cic_textual_parser2
+META.helm-cic_unification
+META.helm-getter
+META.helm-mathql
+META.helm-mathql_interpreter
+META.helm-mathql_test
+META.helm-mathql_generator
+META.helm-pxp
+META.helm-tactics
+META.helm-urimanager
+META.helm-xml
+META.helm-cic_transformations
+META.helm-cic_omdoc

diff --git a/helm/ocaml/METAS/META.helm-cic.src b/helm/ocaml/METAS/META.helm-cic.src
new file mode 100644 (file)
index 0000000..ee898d8
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic.src
@@ -0,0 +1,5 @@
+requires="helm-urimanager helm-pxp"
+version="0.0.1"
+archive(byte)="cic.cma"
+archive(native)="cic.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_annotations.src b/helm/ocaml/METAS/META.helm-cic_annotations.src
new file mode 100644 (file)
index 0000000..829efba
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_annotations.src
@@ -0,0 +1,5 @@
+requires="helm-cic helm-xml"
+version="0.0.1"
+archive(byte)="cic_annotations.cma"
+archive(native)="cic_annotations.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_annotations_cache.src b/helm/ocaml/METAS/META.helm-cic_annotations_cache.src
new file mode 100644 (file)
index 0000000..38f5d1d
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_annotations_cache.src
@@ -0,0 +1,5 @@
+requires="helm-cic_annotations"
+version="0.0.1"
+archive(byte)="cic_annotations_cache.cma"
+archive(native)="cic_annotations_cache.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_cache.src b/helm/ocaml/METAS/META.helm-cic_cache.src
new file mode 100644 (file)
index 0000000..28ea57e
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_cache.src
@@ -0,0 +1,5 @@
+requires="helm-cic"
+version="0.0.1"
+archive(byte)="cic_cache.cma"
+archive(native)="cic_cache.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_omdoc.src b/helm/ocaml/METAS/META.helm-cic_omdoc.src
new file mode 100644 (file)
index 0000000..e05ddfc
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_omdoc.src
@@ -0,0 +1,4 @@
+requires="helm-cic_proof_checking helm-mathql_interpreter"
+version="0.0.1"
+archive(byte)="cic_omdoc.cma"
+archive(native)="cic_omdoc.cmxa"

diff --git a/helm/ocaml/METAS/META.helm-cic_proof_checking.src b/helm/ocaml/METAS/META.helm-cic_proof_checking.src
new file mode 100644 (file)
index 0000000..08b099e
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_proof_checking.src
@@ -0,0 +1,7 @@
+requires="helm-cic"
+version="0.0.1"
+archive(byte)="cic_proof_checking.cma"
+archive(native)="cic_proof_checking.cmxa"
+archive(byte,miniReduction)="cicSubstitution.cmo cicMiniReduction.cmo"
+archive(native,miniReduction)="cicSubstitution.cmx cicMiniReduction.cmx"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_textual_parser.src b/helm/ocaml/METAS/META.helm-cic_textual_parser.src
new file mode 100644 (file)
index 0000000..bc4f2fc
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_textual_parser.src
@@ -0,0 +1,5 @@
+requires="helm-cic"
+version="0.0.1"
+archive(byte)="cic_textual_parser.cma"
+archive(native)="cic_textual_parser.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_textual_parser2.src b/helm/ocaml/METAS/META.helm-cic_textual_parser2.src
new file mode 100644 (file)
index 0000000..043a289
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_textual_parser2.src
@@ -0,0 +1,5 @@
+requires="helm-cic"
+version="0.0.1"
+archive(byte)="cic_textual_parser2.cma"
+archive(native)="cic_textual_parser2.cmxa"
+linkopts="-I +camlp4 gramlib.cma"

diff --git a/helm/ocaml/METAS/META.helm-cic_transformations.src b/helm/ocaml/METAS/META.helm-cic_transformations.src
new file mode 100644 (file)
index 0000000..44bb099
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_transformations.src
@@ -0,0 +1,5 @@
+requires="helm-xml helm-cic_proof_checking helm-cic_omdoc gdome2-xslt"
+version="0.0.1"
+archive(byte)="cic_transformations.cma"
+archive(native)="cic_transformations.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-cic_unification.src b/helm/ocaml/METAS/META.helm-cic_unification.src
new file mode 100644 (file)
index 0000000..6cb775d
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-cic_unification.src
@@ -0,0 +1,5 @@
+requires="helm-cic_proof_checking"
+version="0.0.1"
+archive(byte)="cic_unification.cma"
+archive(native)="cic_unification.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-getter.src b/helm/ocaml/METAS/META.helm-getter.src
new file mode 100644 (file)
index 0000000..8ba941f
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-getter.src
@@ -0,0 +1,5 @@
+requires="helm-urimanager pxp netclient"
+version="0.0.1"
+archive(byte)="getter.cma"
+archive(native)="getter.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-mathql.src b/helm/ocaml/METAS/META.helm-mathql.src
new file mode 100644 (file)
index 0000000..df553d7
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-mathql.src
@@ -0,0 +1,5 @@
+requires="helm-urimanager"
+version="1.3"
+archive(byte)="mathql.cma"
+archive(native)="mathql.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-mathql_generator.src b/helm/ocaml/METAS/META.helm-mathql_generator.src
new file mode 100644 (file)
index 0000000..c416820
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-mathql_generator.src
@@ -0,0 +1,5 @@
+requires="helm-cic helm-cic_proof_checking helm-mathql"
+version="1.3"
+archive(byte)="mathql_generator.cma"
+archive(native)="mathql_generator.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-mathql_interpreter.src b/helm/ocaml/METAS/META.helm-mathql_interpreter.src
new file mode 100644 (file)
index 0000000..24a1929
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-mathql_interpreter.src
@@ -0,0 +1,6 @@
+requires="helm-cic helm-cic_textual_parser postgres helm-mathql"
+#natile-galax 
+version="1.3"
+archive(byte)="mathql_interpreter.cma"
+archive(native)="mathql_interpreter.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-pxp.src b/helm/ocaml/METAS/META.helm-pxp.src
new file mode 100644 (file)
index 0000000..33210a7
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-pxp.src
@@ -0,0 +1,5 @@
+requires="helm-getter"
+version="0.0.1"
+archive(byte)="pxp.cma"
+archive(native)="pxp.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-tactics.src b/helm/ocaml/METAS/META.helm-tactics.src
new file mode 100644 (file)
index 0000000..cffd94f
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-tactics.src
@@ -0,0 +1,4 @@
+requires="helm-cic_textual_parser helm-cic_proof_checking helm-cic_unification helm-mathql_generator"
+version="0.0.1"
+archive(byte)="tactics.cma"
+archive(native)="tactics.cmxa"

diff --git a/helm/ocaml/METAS/META.helm-tex_cic_textual_parser.src b/helm/ocaml/METAS/META.helm-tex_cic_textual_parser.src
new file mode 100644 (file)
index 0000000..dec21ee
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-tex_cic_textual_parser.src
@@ -0,0 +1,5 @@
+requires="helm-cic"
+version="0.0.1"
+archive(byte)="tex_cic_textual_parser.cma"
+archive(native)="tex_cic_textual_parser.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-urimanager.src b/helm/ocaml/METAS/META.helm-urimanager.src
new file mode 100644 (file)
index 0000000..ff18746
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-urimanager.src
@@ -0,0 +1,5 @@
+requires="str"
+version="0.0.1"
+archive(byte)="urimanager.cma"
+archive(native)="urimanager.cmxa"
+linkopts=""

diff --git a/helm/ocaml/METAS/META.helm-xml.src b/helm/ocaml/METAS/META.helm-xml.src
new file mode 100644 (file)
index 0000000..1cd68fe
--- /dev/null
+++ b/helm/ocaml/METAS/META.helm-xml.src
@@ -0,0 +1,5 @@
+requires=""
+version="0.0.1"
+archive(byte)="xml.cma"
+archive(native)="xml.cmxa"
+linkopts=""

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index c53a83b5a660cd9d963d733ff429505585505ebb..5ecff06a0a6518d2498dde6f909e5f6d8885ca31 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -8,15 +8,17 @@ MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
 
-METAS = $(MODULES:%=META.helm-%)
+METAS = $(MODULES:%=METAS/META.helm-%)
 CWD=`pwd`
 
-all: $(METAS) $(MODULES:%=%.all)
-opt: $(METAS) $(MODULES:%=%.opt)
+all: metas $(MODULES:%=%.all)
+opt: metas $(MODULES:%=%.opt)
+metas: $(METAS)
 depend: $(MODULES:%=%.depend)
 install: $(MODULES:%=%.install)
 uninstall: $(MODULES:%=%.uninstall)
-clean: $(MODULES:%=%.clean)
+clean: $(MODULES:%=%.clean) clean_metas
+clean_metas:
        rm -f $(METAS)
 
 dist-clean: clean
@@ -38,8 +40,8 @@ $(MODULES:%=%.uninstall):
        rm -f $(OCAMLFIND_META_DIR)/$(@:%.uninstall=META.helm-%)
 $(MODULES:%=%.clean):
        cd $(@:%.clean=%) && make clean
-META.helm-%: META.helm-%.src
-       cp $< $@ && echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@
+METAS/META.helm-%: METAS/META.helm-%.src
+       cp $< $@ && echo "directory=\"$(CWD)/$*\"" >> $@
 
 .PHONY: .dep.dot
 .dep.dot: