The unpac monorepo manager self-hosting as a monorepo using unpac
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge ocamldoc/Makefile.best_ocamldoc into Makefile.best_binaries

Makefile.best_ocamldoc was included in two files:

1. In ocamldoc/Makefile, which also includes

$(ROOTDIR)/Makefile.best_binaries

So that the definitions which were in Makefile.best_ocamldoc remain available.

2. In api_docgen/ocamldoc/Makefile which also includes
Makefile.best_binaries via api_docgen/Makefile.common

+25 -41
+25
Makefile.best_binaries
··· 57 57 $(call check_not_stale,boot/ocamlc,ocamlc.opt$(EXE)))), \ 58 58 $(ROOTDIR)/ocamlc.opt$(EXE) -depend, \ 59 59 $(BOOT_OCAMLC) -depend)) 60 + 61 + OCAMLDOC = $(ROOTDIR)/ocamldoc/ocamldoc$(EXE) 62 + OCAMLDOC_OPT = $(ROOTDIR)/ocamldoc/ocamldoc.opt$(EXE) 63 + 64 + ifeq "$(TARGET)" "$(HOST)" 65 + ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" 66 + OCAMLDOC_RUN_BYTE = $(NEW_OCAMLRUN) -I $(ROOTDIR)/otherlibs/unix \ 67 + -I $(ROOTDIR)/otherlibs/str $(OCAMLDOC) 68 + else 69 + # if shared-libraries are not supported, unix.cma and str.cma 70 + # are compiled with -custom, so ocamldoc also uses -custom, 71 + # and (ocamlrun ocamldoc) does not work. 72 + OCAMLDOC_RUN_BYTE = $(OCAMLDOC) 73 + endif 74 + else 75 + OCAMLDOC_RUN_BYTE = $(NEW_OCAMLRUN) $(OCAMLDOC) 76 + endif 77 + 78 + OCAMLDOC_RUN_OPT = $(OCAMLDOC_OPT) 79 + 80 + ifeq "$(wildcard $(OCAMLDOC_OPT))" "" 81 + OCAMLDOC_RUN = $(OCAMLDOC_RUN_BYTE) 82 + else 83 + OCAMLDOC_RUN = $(OCAMLDOC_RUN_OPT) 84 + endif
-1
api_docgen/ocamldoc/Makefile
··· 15 15 # Used by included Makefiles 16 16 ROOTDIR = ../.. 17 17 include ../Makefile.common 18 - include ../../ocamldoc/Makefile.best_ocamldoc 19 18 vpath %.mli ../../stdlib $(DOC_COMPILERLIBS_DIRS) $(DOC_STDLIB_DIRS) 20 19 21 20
-1
ocamldoc/Makefile
··· 25 25 ############## 26 26 27 27 programs := ocamldoc ocamldoc.opt 28 - include Makefile.best_ocamldoc 29 28 30 29 OCAMLDOC_LIBCMA=odoc_info.cma 31 30 OCAMLDOC_LIBCMI=odoc_info.cmi
-39
ocamldoc/Makefile.best_ocamldoc
··· 1 - #************************************************************************** 2 - #* * 3 - #* OCaml * 4 - #* * 5 - #* Florian Angeletti, projet Cambium, Inria Paris * 6 - #* * 7 - #* Copyright 2020 Institut National de Recherche en Informatique et * 8 - #* en Automatique. * 9 - #* * 10 - #* All rights reserved. This file is distributed under the terms of * 11 - #* the GNU Lesser General Public License version 2.1, with the * 12 - #* special exception on linking described in the file LICENSE. * 13 - #* * 14 - #************************************************************************** 15 - 16 - OCAMLDOC = $(ROOTDIR)/ocamldoc/ocamldoc$(EXE) 17 - OCAMLDOC_OPT = $(ROOTDIR)/ocamldoc/ocamldoc.opt$(EXE) 18 - 19 - ifeq "$(TARGET)" "$(HOST)" 20 - ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" 21 - OCAMLDOC_RUN_BYTE = $(NEW_OCAMLRUN) -I $(ROOTDIR)/otherlibs/unix \ 22 - -I $(ROOTDIR)/otherlibs/str $(OCAMLDOC) 23 - else 24 - # if shared-libraries are not supported, unix.cma and str.cma 25 - # are compiled with -custom, so ocamldoc also uses -custom, 26 - # and (ocamlrun ocamldoc) does not work. 27 - OCAMLDOC_RUN_BYTE = $(OCAMLDOC) 28 - endif 29 - else 30 - OCAMLDOC_RUN_BYTE = $(NEW_OCAMLRUN) $(OCAMLDOC) 31 - endif 32 - 33 - OCAMLDOC_RUN_OPT = $(OCAMLDOC_OPT) 34 - 35 - ifeq "$(wildcard $(OCAMLDOC_OPT))" "" 36 - OCAMLDOC_RUN = $(OCAMLDOC_RUN_BYTE) 37 - else 38 - OCAMLDOC_RUN = $(OCAMLDOC_RUN_OPT) 39 - endif