diff options
| author | Wojciech Matyjewicz <wmatyjewicz@fastmail.fm> | 2011-11-09 12:00:39 +0000 |
|---|---|---|
| committer | Wojciech Matyjewicz <wmatyjewicz@fastmail.fm> | 2011-11-09 12:00:39 +0000 |
| commit | 6f274a5e81b028baa7290dd5645e8796850e8c7a (patch) | |
| tree | 9c2c20573656b715d85bd5ce3e37ed57d9fcaedb /bindings | |
| parent | b80ada98c50df226e210eabc9547101c5dee2181 (diff) | |
| download | llvm-6f274a5e81b028baa7290dd5645e8796850e8c7a.tar.gz llvm-6f274a5e81b028baa7290dd5645e8796850e8c7a.tar.bz2 llvm-6f274a5e81b028baa7290dd5645e8796850e8c7a.tar.xz | |
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
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/ocaml/Makefile.ocaml | 8 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/Makefile | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml index 40ecc9c08e..a2a8b02eac 100644 --- 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) - $(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 $(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 \ diff --git a/bindings/ocaml/llvm/Makefile b/bindings/ocaml/llvm/Makefile index 673eaa2e35..203075a9bd 100644 --- 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 $< $@ -install-meta:: $(ObjDir)/META.llvm +install-meta:: $(OcamlDir)/META.llvm $(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)" + +.PHONY: copy-meta install-meta uninstall-meta |