From e97039cc9e0a8e4f992c712a1ccf47c801e1abcc Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Tue, 27 Nov 2001 11:58:50 +0000 Subject: [PATCH] 1) .cma/.cmxa used to simplify META files. 2) Common parts of Makefiles factorized into Makefile.common 3) Makefile added --- helm/ocaml/META.helm-cic | 6 +-- helm/ocaml/META.helm-cic_annotations | 6 +-- helm/ocaml/META.helm-cic_annotations_cache | 6 +-- helm/ocaml/META.helm-cic_cache | 6 +-- helm/ocaml/META.helm-cic_proof_checking | 6 +-- helm/ocaml/META.helm-getter | 6 +-- helm/ocaml/META.helm-pxp | 6 +-- helm/ocaml/META.helm-urimanager | 6 +-- helm/ocaml/META.helm-xml | 6 +-- helm/ocaml/Makefile | 6 +++ helm/ocaml/Makefile.common | 51 +++++++++++++++++++++ helm/ocaml/cic/.cvsignore | 2 +- helm/ocaml/cic/Makefile | 33 ++----------- helm/ocaml/cic_annotations/.cvsignore | 2 +- helm/ocaml/cic_annotations/Makefile | 36 ++------------- helm/ocaml/cic_annotations_cache/.cvsignore | 2 +- helm/ocaml/cic_annotations_cache/Makefile | 33 ++----------- helm/ocaml/cic_cache/.cvsignore | 2 +- helm/ocaml/cic_cache/Makefile | 33 ++----------- helm/ocaml/cic_proof_checking/.cvsignore | 2 +- helm/ocaml/cic_proof_checking/Makefile | 37 ++------------- helm/ocaml/getter/.cvsignore | 2 +- helm/ocaml/getter/Makefile | 35 ++------------ helm/ocaml/pxp/.cvsignore | 2 +- helm/ocaml/pxp/Makefile | 33 ++----------- helm/ocaml/urimanager/.cvsignore | 2 +- helm/ocaml/urimanager/Makefile | 33 ++----------- helm/ocaml/xml/.cvsignore | 2 +- helm/ocaml/xml/Makefile | 33 ++----------- 29 files changed, 124 insertions(+), 311 deletions(-) create mode 100644 helm/ocaml/Makefile create mode 100644 helm/ocaml/Makefile.common diff --git a/helm/ocaml/META.helm-cic b/helm/ocaml/META.helm-cic index 119b9a406..4fcb7055b 100644 --- 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 64cc7956a..db1361816 100644 --- 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 88ebb07f7..50654135d 100644 --- 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 d0401a489..0b6b4e636 100644 --- 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 858f59e6e..59657d3c2 100644 --- 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 90e330e90..088aa3bed 100644 --- 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 1a5b02463..68bdbf291 100644 --- 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 281b1260d..805f9f1c3 100644 --- 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 616b5f186..7f59db45d 100644 --- 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 index 000000000..e488c6401 --- /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 index 000000000..b7eefedbc --- /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 6e857ea2a..6b3eba302 100644 --- 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 36e718dc6..fd810f3f7 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 776d6c459..738a265ec 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 d5abc7bb4..887553062 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 f149ac97d..76cba058e 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 61ba3b55d..97bd462b5 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 686b2ddd3..a3b941b0f 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 09b7e613e..2a89a95f0 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 b935779d8..2d01dee04 100644 --- 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 6e857ea2a..6b3eba302 100644 --- 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 90e1011e5..f1037d90e 100644 --- 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 -- 2.39.2