Minor fixes in Makefiles for the OCaml bindings:

1. Interface files (.mli) are installed before compiled interface
   files (.cmi) to preserve timestamp relation.
2. install-meta should use $(OcamlDir) instead of $(ObjDir).
3. Declared some targets as .PHONY.

Patch by Christophe Raffalli.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144183 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml
index 40ecc9c08e0912f50647f935b9b25d84958da1f7..a2a8b02eac7d33bfda52183cc4ac9feaa381626d 100644 (file)
--- a/bindings/ocaml/Makefile.ocaml
+++ b/bindings/ocaml/Makefile.ocaml
@@ -238,14 +238,14 @@ clean-cmis::
 # Also install the .mli's (headers) as documentation.
 install-cmis: $(OutputsCMI) $(OcamlHeaders)
        $(Verb) $(MKDIR) $(PROJ_libocamldir)
 # Also install the .mli's (headers) as documentation.
 install-cmis: $(OutputsCMI) $(OcamlHeaders)
        $(Verb) $(MKDIR) $(PROJ_libocamldir)

-       $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \
-         $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
-         $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \
-       done

        $(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \
          $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
          $(DataInstall) $(ObjDir)/$$i "$(PROJ_libocamldir)/$$i"; \
        done
        $(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \
          $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
          $(DataInstall) $(ObjDir)/$$i "$(PROJ_libocamldir)/$$i"; \
        done

+       $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \
+         $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
+         $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \
+       done

 
 uninstall-cmis::
        $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \
 
 uninstall-cmis::
        $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \

diff --git a/bindings/ocaml/llvm/Makefile b/bindings/ocaml/llvm/Makefile
index 673eaa2e35a93c46cd6817a7baabbe9d9785079f..203075a9bddeb6c204530717f64fef4703baa8c2 100644 (file)
--- a/bindings/ocaml/llvm/Makefile
+++ b/bindings/ocaml/llvm/Makefile
@@ -30,11 +30,13 @@ copy-meta: $(OcamlDir)/META.llvm
 $(OcamlDir)/META.llvm: META.llvm
        $(Verb) $(CP) -f $< $@
 
 $(OcamlDir)/META.llvm: META.llvm
        $(Verb) $(CP) -f $< $@
 

-install-meta:: $(ObjDir)/META.llvm
+install-meta:: $(OcamlDir)/META.llvm

        $(Echo) "Install $(BuildMode) $(DestMETA)"
        $(Verb) $(MKDIR) $(PROJ_libocamldir)
        $(Echo) "Install $(BuildMode) $(DestMETA)"
        $(Verb) $(MKDIR) $(PROJ_libocamldir)

-       $(Verb) $(DataInstall) META.llvm "$(DestMETA)"
+       $(Verb) $(DataInstall) $< "$(DestMETA)"

 
 uninstall-meta::
        $(Echo) "Uninstalling $(DestMETA)"
        -$(Verb) $(RM) -f "$(DestMETA)"
 
 uninstall-meta::
        $(Echo) "Uninstalling $(DestMETA)"
        -$(Verb) $(RM) -f "$(DestMETA)"

+
+.PHONY: copy-meta install-meta uninstall-meta