1) .cma/.cmxa used to simplify META files.

2) Common parts of Makefiles factorized into Makefile.common
3) Makefile added

diff --git a/helm/ocaml/META.helm-cic b/helm/ocaml/META.helm-cic
index 119b9a4061eff761badb95ce92745bd0a289428a..4fcb7055b0aa6f391332112221140448a19219c7 100644 (file)
--- a/helm/ocaml/META.helm-cic
+++ b/helm/ocaml/META.helm-cic
@@ -1,6 +1,6 @@
 requires="helm-urimanager helm-pxp"
 version="0.0.1"
-archive(byte)="cic.cmo deannotate.cmo cicParser3.cmo cicParser2.cmo cicParser.cmo"
-archive(native)="cic.cmx deannotate.cmx cicParser3.cmx cicParser2.cmx cicParser.cmx"
+archive(byte)="cic.cma"
+archive(native)="cic.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/cic"
+directory="/home/sacerdot/miohelm/helm/ocaml/cic"

diff --git a/helm/ocaml/META.helm-cic_annotations b/helm/ocaml/META.helm-cic_annotations
index 64cc7956adb1f8e2e6cec64b6402530dfb1a97d7..db136181658102108c56a9a95eef59b2cc9e9244 100644 (file)
--- a/helm/ocaml/META.helm-cic_annotations
+++ b/helm/ocaml/META.helm-cic_annotations
@@ -1,6 +1,6 @@
 requires="helm-cic helm-xml lablgtk"
 version="0.0.1"
-archive(byte)="cicAnnotation2Xml.cmo cicAnnotationHinter.cmo cicAnnotationParser2.cmo cicAnnotationParser.cmo cicXPath.cmo"
-archive(native)="cicAnnotation2Xml.cmx cicAnnotationHinter.cmx cicAnnotationParser2.cmx cicAnnotationParser.cmx cicXPath.cmx"
+archive(byte)="cic_annotations.cma"
+archive(native)="cic_annotations.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/cic_annotations"
+directory="/home/sacerdot/miohelm/helm/ocaml/cic_annotations"

diff --git a/helm/ocaml/META.helm-cic_annotations_cache b/helm/ocaml/META.helm-cic_annotations_cache
index 88ebb07f7aa26ccb7a23f0b45981b3897281defe..50654135d2cc2032ed2218a822890cdb5ac4c643 100644 (file)
--- a/helm/ocaml/META.helm-cic_annotations_cache
+++ b/helm/ocaml/META.helm-cic_annotations_cache
@@ -1,6 +1,6 @@
 requires="helm-cic_annotations"
 version="0.0.1"
-archive(byte)="cicCache.cmo"
-archive(native)="cicCache.cmx"
+archive(byte)="cic_annotations_cache.cma"
+archive(native)="cic_annotations_cache.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/cic_annotations_cache"
+directory="/home/sacerdot/miohelm/helm/ocaml/cic_annotations_cache"

diff --git a/helm/ocaml/META.helm-cic_cache b/helm/ocaml/META.helm-cic_cache
index d0401a489ee0dd725dcf6dc7ea17d2149c174718..0b6b4e636777b43f318eef990f19eb3ad6dc83e2 100644 (file)
--- a/helm/ocaml/META.helm-cic_cache
+++ b/helm/ocaml/META.helm-cic_cache
@@ -1,6 +1,6 @@
 requires="helm-cic"
 version="0.0.1"
-archive(byte)="cicCache.cmo"
-archive(native)="cicCache.cmx"
+archive(byte)="cic_cache.cma"
+archive(native)="cic_cache.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/cic_cache"
+directory="/home/sacerdot/miohelm/helm/ocaml/cic_cache"

diff --git a/helm/ocaml/META.helm-cic_proof_checking b/helm/ocaml/META.helm-cic_proof_checking
index 858f59e6e00fd6ce75c011ac2358cc8671986330..59657d3c2d3e995b967a4be49d46ef41da948595 100644 (file)
--- a/helm/ocaml/META.helm-cic_proof_checking
+++ b/helm/ocaml/META.helm-cic_proof_checking
@@ -1,8 +1,8 @@
 requires="helm-cic"
 version="0.0.1"
-archive(byte)="cicSubstitution.cmo cicEnvironment.cmo cicPp.cmo cicReduction.cmo cicTypeChecker.cmo cicCooking.cmo"
-archive(native)="cicSubstitution.cmx cicEnvironment.cmx cicPp.cmx cicReduction.cmx cicTypeChecker.cmx cicCooking.cmx"
+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=""
-directory="/home/sacerdot/miohelm/ocaml/helm/cic_proof_checking"
+directory="/home/sacerdot/miohelm/helm/ocaml/cic_proof_checking"

diff --git a/helm/ocaml/META.helm-getter b/helm/ocaml/META.helm-getter
index 90e330e904c6db743e1cbe62984b9e586d3821d0..088aa3bedddbcfb71f8943ca2bbb38c58fcb537a 100644 (file)
--- a/helm/ocaml/META.helm-getter
+++ b/helm/ocaml/META.helm-getter
@@ -1,6 +1,6 @@
 requires="helm-urimanager pxp netclient"
 version="0.0.1"
-archive(byte)="configuration.cmo clientHTTP.cmo getter.cmo"
-archive(native)="configuration.cmx clientHTTP.cmx getter.cmx"
+archive(byte)="getter.cma"
+archive(native)="getter.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/getter"
+directory="/home/sacerdot/miohelm/helm/ocaml/getter"

diff --git a/helm/ocaml/META.helm-pxp b/helm/ocaml/META.helm-pxp
index 1a5b024632c76f2ac019c0574e2c2ba1d08ac890..68bdbf29117784bd5f132fb9ba53a96f6acf65ae 100644 (file)
--- a/helm/ocaml/META.helm-pxp
+++ b/helm/ocaml/META.helm-pxp
@@ -1,6 +1,6 @@
 requires="helm-getter"
 version="0.0.1"
-archive(byte)="csc_pxp_reader.cmo pxpUriResolver.cmo"
-archive(native)="csc_pxp_reader.cmx pxpUriResolver.cmx"
+archive(byte)="pxp.cma"
+archive(native)="pxp.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/pxp"
+directory="/home/sacerdot/miohelm/helm/ocaml/pxp"

diff --git a/helm/ocaml/META.helm-urimanager b/helm/ocaml/META.helm-urimanager
index 281b1260dc5dcc9aaab0e9a2f40dadfefcfa2eee..805f9f1c31bc7f08c9b852e2c242ae71d79d4693 100644 (file)
--- a/helm/ocaml/META.helm-urimanager
+++ b/helm/ocaml/META.helm-urimanager
@@ -1,6 +1,6 @@
 requires="str"
 version="0.0.1"
-archive(byte)="uriManager.cmo"
-archive(native)="uriManager.cmx"
+archive(byte)="urimanager.cma"
+archive(native)="urimanager.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/urimanager"
+directory="/home/sacerdot/miohelm/helm/ocaml/urimanager"

diff --git a/helm/ocaml/META.helm-xml b/helm/ocaml/META.helm-xml
index 616b5f186b2b47ccbb4469f93392776c77966006..7f59db45da6b5e6d58c0916ab55117d2ff10cb11 100644 (file)
--- a/helm/ocaml/META.helm-xml
+++ b/helm/ocaml/META.helm-xml
@@ -1,6 +1,6 @@
 requires=""
 version="0.0.1"
-archive(byte)="xml.cmo"
-archive(native)="xml.cmx"
+archive(byte)="xml.cma"
+archive(native)="xml.cmxa"
 linkopts=""
-directory="/home/sacerdot/miohelm/ocaml/helm/xml"
+directory="/home/sacerdot/miohelm/helm/ocaml/xml"

diff --git a/helm/ocaml/Makefile b/helm/ocaml/Makefile
new file mode 100644 (file)
index 0000000..e488c64
--- /dev/null
+++ b/helm/ocaml/Makefile
@@ -0,0 +1,6 @@
+# Warning: the modules must be in compilation order
+MODULES= xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
+         cic_cache cic_proof_checking
+
+all opt depend install uninstall clean:
+       for i in $(MODULES) ; do (cd $$i ; make $@) ; done

diff --git a/helm/ocaml/Makefile.common b/helm/ocaml/Makefile.common
new file mode 100644 (file)
index 0000000..b7eefed
--- /dev/null
+++ b/helm/ocaml/Makefile.common
@@ -0,0 +1,51 @@
+# This Makefile must be included by another one defining:
+#  $REQUIRES
+#  $PREDICATES
+#  $DEPOBJS
+#  $OBJECTS
+#  $PACKAGE
+# and put in a directory where there is a .depend file.
+
+BIN_DIR = /usr/local/bin
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
+OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLDEP = ocamldep
+
+ARCHIVE = $(PACKAGE).cma
+#ARCHIVE_C = $(PACKAGE).a
+ARCHIVE_OPT = $(PACKAGE).cmxa
+
+
+$(ARCHIVE): $(OBJECTS)
+       $(OCAMLC) -a -o $@ $^
+
+$(ARCHIVE_OPT): $(OBJECTS:.cmo=.cmx)
+       $(OCAMLOPT) -a -o $@ $^
+
+all: $(ARCHIVE)
+opt: $(ARCHIVE_OPT)
+
+depend:
+       $(OCAMLDEP) $(DEPOBJS) > .depend
+
+.SUFFIXES: .ml .mli .cmo .cmi .cmx
+.ml.cmo:
+       $(OCAMLC) -c $<
+.mli.cmi:
+       $(OCAMLC) -c $<
+.ml.cmx:
+       $(OCAMLOPT) -c $<
+
+clean:
+       rm -f *.cm[ioax] *.cmxa *.o
+
+install:
+       #cp
+
+uninstall:
+       #rm -f
+
+.PHONY: all opt depend install uninstall clean
+
+include .depend

diff --git a/helm/ocaml/cic/.cvsignore b/helm/ocaml/cic/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/cic/.cvsignore
+++ b/helm/ocaml/cic/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/cic/Makefile b/helm/ocaml/cic/Makefile
index 36e718dc67d348de7d293e998cad89173aeb54bb..fd810f3f70ab374c47a0144b6ec2a19f631e73aa 100644 (file)
--- a/helm/ocaml/cic/Makefile
+++ b/helm/ocaml/cic/Makefile
@@ -1,37 +1,10 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = cic
 REQUIRES = helm-urimanager helm-pxp
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: cic.cmo deannotate.cmo cicParser3.cmo cicParser2.cmo cicParser.cmo
-opt: cic.cmx deannotate.cmx cicParser3.cmx cicParser2.cmx cicParser.cmx
 
 DEPOBJS = cic.ml deannotate.mli deannotate.ml cicParser3.mli cicParser3.ml \
           cicParser2.mli cicParser2.ml cicParser.mli cicParser.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = cic.cmo deannotate.cmo cicParser3.cmo cicParser2.cmo cicParser.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/cic_annotations/.cvsignore b/helm/ocaml/cic_annotations/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/cic_annotations/.cvsignore
+++ b/helm/ocaml/cic_annotations/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/cic_annotations/Makefile b/helm/ocaml/cic_annotations/Makefile
index 776d6c459632d26e56d70aa6b62a87062806ee00..738a265ecb1dd4ff5350a0e1eabed7ac11bbab3a 100644 (file)
--- a/helm/ocaml/cic_annotations/Makefile
+++ b/helm/ocaml/cic_annotations/Makefile
@@ -1,39 +1,11 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = cic_annotations
 REQUIRES = helm-cic helm-xml lablgtk
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: cicAnnotation2Xml.cmo cicAnnotationHinter.cmo cicAnnotationParser2.cmo \
-     cicAnnotationParser.cmo cicXPath.cmo
-opt: cicAnnotation2Xml.cmx cicAnnotationHinter.cmx cicAnnotationParser2.cmx \
-     cicAnnotationParser.cmx cicXPath.cmx
 
 DEPOBJS = cicAnnotation2Xml.ml cicAnnotationHinter.ml cicAnnotationParser2.ml \
           cicAnnotationParser.ml cicXPath.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = cicAnnotation2Xml.cmo cicAnnotationHinter.cmo \
+          cicAnnotationParser2.cmo cicAnnotationParser.cmo cicXPath.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/cic_annotations_cache/.cvsignore b/helm/ocaml/cic_annotations_cache/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/cic_annotations_cache/.cvsignore
+++ b/helm/ocaml/cic_annotations_cache/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/cic_annotations_cache/Makefile b/helm/ocaml/cic_annotations_cache/Makefile
index d5abc7bb494a05f2443d64e6546813f513bc0d4b..88755306207dd084770d4290487a8f62c0468b62 100644 (file)
--- a/helm/ocaml/cic_annotations_cache/Makefile
+++ b/helm/ocaml/cic_annotations_cache/Makefile
@@ -1,36 +1,9 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = cic_annotations_cache
 REQUIRES = helm-cic_annotations
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: cicCache.cmo
-opt: cicCache.cmx
 
 DEPOBJS = cicCache.mli cicCache.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = cicCache.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/cic_cache/.cvsignore b/helm/ocaml/cic_cache/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/cic_cache/.cvsignore
+++ b/helm/ocaml/cic_cache/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/cic_cache/Makefile b/helm/ocaml/cic_cache/Makefile
index f149ac97d4f94d2ca3f1df93b83a9da555edc83e..76cba058e9df893a617b07278e7bf7c192f901e3 100644 (file)
--- a/helm/ocaml/cic_cache/Makefile
+++ b/helm/ocaml/cic_cache/Makefile
@@ -1,36 +1,9 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = cic_cache
 REQUIRES = helm-cic
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: cicCache.cmo
-opt: cicCache.cmx
 
 DEPOBJS = cicCache.mli cicCache.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = cicCache.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/cic_proof_checking/.cvsignore b/helm/ocaml/cic_proof_checking/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/cic_proof_checking/.cvsignore
+++ b/helm/ocaml/cic_proof_checking/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/cic_proof_checking/Makefile b/helm/ocaml/cic_proof_checking/Makefile
index 61ba3b55d85557d5e9851fe184a41c17338fbf34..97bd462b5e8deac388c3180b7af3d922602c5aa2 100644 (file)
--- a/helm/ocaml/cic_proof_checking/Makefile
+++ b/helm/ocaml/cic_proof_checking/Makefile
@@ -1,41 +1,14 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = cic_proof_checking
 REQUIRES = helm-cic
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: cicSubstitution.cmo cicEnvironment.cmo cicPp.cmo cicMiniReduction.cmo \
-     cicReduction.cmo cicTypeChecker.cmo cicCooking.cmo
-opt: cicSubstitution.cmx cicEnvironment.cmx cicPp.cmx cicMiniReduction.cmx \
-     cicReduction.cmx cicTypeChecker.cmx cicCooking.cmx
 
 DEPOBJS = cicPp.mli cicPp.ml cicEnvironment.mli cicEnvironment.ml \
           cicSubstitution.mli cicSubstitution.ml cicReduction.mli \
           cicReduction.ml cicTypeChecker.mli cicTypeChecker.ml \
           cicCooking.mli cicCooking.ml cicMinireduction.mli cicMiniReduction.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = cicSubstitution.cmo cicEnvironment.cmo cicPp.cmo \
+          cicMiniReduction.cmo cicReduction.cmo cicTypeChecker.cmo \
+          cicCooking.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/getter/.cvsignore b/helm/ocaml/getter/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/getter/.cvsignore
+++ b/helm/ocaml/getter/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/getter/Makefile b/helm/ocaml/getter/Makefile
index 686b2ddd33a904eee3496a4d17002692b84e3468..a3b941b0f7d0eab9a58d45f5df68dc1aae651c3e 100644 (file)
--- a/helm/ocaml/getter/Makefile
+++ b/helm/ocaml/getter/Makefile
@@ -1,36 +1,9 @@
-BIN_DIR = /usr/local/bin
-REQUIRES = pxp netclient helm-urimanager pxp netclient
+PACKAGE = getter
+REQUIRES = pxp netclient helm-urimanager
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: clientHTTP.cmo getter.cmo configuration.cmo
-opt: clientHTTP.cmx getter.cmx configuration.cmx
 
 DEPOBJS = clientHTTP.mli clientHTTP.ml getter.mli getter.ml configuration.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = configuration.cmo clientHTTP.cmo getter.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/pxp/.cvsignore b/helm/ocaml/pxp/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/pxp/.cvsignore
+++ b/helm/ocaml/pxp/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/pxp/Makefile b/helm/ocaml/pxp/Makefile
index 09b7e613e15673fc78b546e80dfe43057cf58c49..2a89a95f0296b32846d94cc22cc75cc3408c80dd 100644 (file)
--- a/helm/ocaml/pxp/Makefile
+++ b/helm/ocaml/pxp/Makefile
@@ -1,36 +1,9 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = pxp
 REQUIRES = helm-getter
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: csc_pxp_reader.cmo pxpUriResolver.cmo
-opt: csc_pxp_reader.cmx pxpUriResolver.cmx
 
 DEPOBJS = csc_pxp_reader.ml pxpUriResolver.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = csc_pxp_reader.cmo pxpUriResolver.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/urimanager/.cvsignore b/helm/ocaml/urimanager/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/urimanager/.cvsignore
+++ b/helm/ocaml/urimanager/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/urimanager/Makefile b/helm/ocaml/urimanager/Makefile
index b935779d875fa9876af551dc75c590f85634c999..2d01dee04d469b338dc2537a6509feffbb41c703 100644 (file)
--- a/helm/ocaml/urimanager/Makefile
+++ b/helm/ocaml/urimanager/Makefile
@@ -1,36 +1,9 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = urimanager
 REQUIRES = str
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: uriManager.cmo
-opt: uriManager.cmx
 
 DEPOBJS = uriManager.mli uriManager.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = uriManager.cmo
 
-include .depend
+include ../Makefile.common

diff --git a/helm/ocaml/xml/.cvsignore b/helm/ocaml/xml/.cvsignore
index 6e857ea2a6b356f1b8597717c32200e84888f05b..6b3eba302c2590bfe8aa1d8b46c0de09ccd948fb 100644 (file)
--- a/helm/ocaml/xml/.cvsignore
+++ b/helm/ocaml/xml/.cvsignore
@@ -1 +1 @@
-*.cm[iox]
+*.cm[iaox] *.cmxa

diff --git a/helm/ocaml/xml/Makefile b/helm/ocaml/xml/Makefile
index 90e1011e5664a3278650094a195ed826c8f06bde..f1037d90e9508a371b73bd76917f4ba679a59e15 100644 (file)
--- a/helm/ocaml/xml/Makefile
+++ b/helm/ocaml/xml/Makefile
@@ -1,36 +1,9 @@
-BIN_DIR = /usr/local/bin
+PACKAGE = xml
 REQUIRES =
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-all: xml.cmo
-opt: xml.cmx
 
 DEPOBJS = xml.mli xml.ml
 
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[iox]
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: install uninstall clean
+OBJECTS = xml.cmo
 
-include .depend
+include ../Makefile.common