The unpac monorepo manager self-hosting as a monorepo using unpac
Deprecate the WITH_OCAMLDOC build variable
This commit introduces two private build variables: OCAMLDOC_TARGET
and OCAMLDOC_OPT_TARGET.
+35
-14
+7
-7
Makefile
+7
-7
Makefile
···
45
45
46
46
OC_OCAMLDEPDIRS = $(VPATH)
47
47
48
-
OCAMLDOC_OPT=$(WITH_OCAMLDOC:=.opt)
49
48
OCAMLTEST_OPT=$(WITH_OCAMLTEST:=.opt)
50
49
51
50
# This list is passed to expunge, which accepts both uncapitalized and
···
743
742
$(MAKE) flexlink.opt$(EXE)
744
743
endif
745
744
$(MAKE) ocamlc.opt
746
-
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
745
+
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(OCAMLDOC_TARGET) \
747
746
$(WITH_OCAMLTEST)
748
747
$(MAKE) ocamlopt.opt
749
748
$(MAKE) otherlibrariesopt
750
-
$(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt $(OCAMLDOC_OPT) \
749
+
$(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt \
750
+
$(OCAMLDOC_OPT_TARGET) \
751
751
$(OCAMLTEST_OPT) othertools ocamlnat
752
-
ifeq "$(WITH_OCAMLDOC)-$(STDLIB_MANPAGES)" "ocamldoc-true"
752
+
ifeq "$(build_ocamldoc)-$(STDLIB_MANPAGES)" "true-true"
753
753
$(MAKE) manpages
754
754
endif
755
755
···
786
786
.PHONY: all
787
787
all: coreall
788
788
$(MAKE) ocaml
789
-
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
789
+
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(OCAMLDOC_TARGET) \
790
790
$(WITH_OCAMLTEST)
791
791
$(MAKE) othertools
792
-
ifeq "$(WITH_OCAMLDOC)-$(STDLIB_MANPAGES)" "ocamldoc-true"
792
+
ifeq "$(build_ocamldoc)-$(STDLIB_MANPAGES)" "true-true"
793
793
$(MAKE) manpages
794
794
endif
795
795
···
2408
2408
ifeq "$(build_ocamldoc)" "true"
2409
2409
$(MAKE) -C ocamldoc install
2410
2410
endif
2411
-
ifeq "$(WITH_OCAMLDOC)-$(STDLIB_MANPAGES)" "ocamldoc-true"
2411
+
ifeq "$(build_ocamldoc)-$(STDLIB_MANPAGES)" "true-true"
2412
2412
$(MAKE) -C api_docgen install
2413
2413
endif
2414
2414
if test -n "$(WITH_DEBUGGER)"; then \
+4
Makefile.build_config.in
+4
Makefile.build_config.in
+4
-1
Makefile.config.in
+4
-1
Makefile.config.in
···
205
205
INSTRUMENTED_RUNTIME=@instrumented_runtime@
206
206
INSTRUMENTED_RUNTIME_LIBS=@instrumented_runtime_libs@
207
207
WITH_DEBUGGER=@with_debugger@
208
-
WITH_OCAMLDOC=@ocamldoc@
209
208
WITH_OCAMLTEST=@ocamltest@
210
209
ASM_CFI_SUPPORTED=@asm_cfi_supported@
211
210
WITH_FRAME_POINTERS=@frame_pointers@
···
227
226
NAKED_POINTERS=false
228
227
229
228
# Deprecated variables
229
+
230
+
## Variables deprecated since OCaml 5.2
231
+
232
+
WITH_OCAMLDOC=@with_ocamldoc@
230
233
231
234
## Variables deprecated since OCaml 5.0
232
235
+11
-3
configure
+11
-3
configure
···
817
817
ocamltest
818
818
documentation_tool_cmd
819
819
documentation_tool
820
+
with_ocamldoc
821
+
ocamldoc_opt_target
822
+
ocamldoc_target
820
823
build_ocamldoc
821
-
ocamldoc
822
824
build_ocamltex
823
825
build_ocamldebug
824
826
with_debugger
···
3378
3380
3379
3381
3380
3382
# TODO: rename this variable
3383
+
3384
+
3381
3385
3382
3386
3383
3387
···
19721
19725
19722
19726
if test x"$enable_ocamldoc" = "xno"
19723
19727
then :
19724
-
ocamldoc=""
19728
+
ocamldoc_target=""
19729
+
ocamldoc_opt_target=""
19730
+
with_ocamldoc=""
19725
19731
build_ocamldoc=false
19726
19732
else $as_nop
19727
-
ocamldoc=ocamldoc
19733
+
ocamldoc_target=ocamldoc
19734
+
ocamldoc_opt_target=ocamldoc.opt
19735
+
with_ocamldoc=ocamldoc
19728
19736
build_ocamldoc=true
19729
19737
ac_config_files="$ac_config_files ocamldoc/META"
19730
19738
+9
-3
configure.ac
+9
-3
configure.ac
···
182
182
AC_SUBST([with_debugger]) # TODO: rename this variable
183
183
AC_SUBST([build_ocamldebug])
184
184
AC_SUBST([build_ocamltex])
185
-
AC_SUBST([ocamldoc])
186
185
AC_SUBST([build_ocamldoc])
186
+
AC_SUBST([ocamldoc_target])
187
+
AC_SUBST([ocamldoc_opt_target])
188
+
AC_SUBST([with_ocamldoc])
187
189
AC_SUBST([documentation_tool])
188
190
AC_SUBST([documentation_tool_cmd])
189
191
AC_SUBST([ocamltest])
···
2250
2252
[install_source_artifacts=true])
2251
2253
2252
2254
AS_IF([test x"$enable_ocamldoc" = "xno"],
2253
-
[ocamldoc=""
2255
+
[ocamldoc_target=""
2256
+
ocamldoc_opt_target=""
2257
+
with_ocamldoc=""
2254
2258
build_ocamldoc=false],
2255
-
[ocamldoc=ocamldoc
2259
+
[ocamldoc_target=ocamldoc
2260
+
ocamldoc_opt_target=ocamldoc.opt
2261
+
with_ocamldoc=ocamldoc
2256
2262
build_ocamldoc=true
2257
2263
AC_CONFIG_FILES([ocamldoc/META])])
2258
2264