bpo-30638: Add clinic to `make regen-all` (GH-5671) · python/cpython@d6ff8a7

@@ -560,10 +560,9 @@ coverage-report: regen-grammar regen-importlib

560560

$(MAKE) coverage-lcov

561561562562

# Run "Argument Clinic" over all source files

563-

# (depends on python having already been built)

564563

.PHONY=clinic

565-

clinic: check-clean-src $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c

566-

$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)

564+

clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c

565+

$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)

567566568567

# Build the interpreter

569568

$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)

@@ -593,9 +592,9 @@ Modules/_math.o: Modules/_math.c Modules/_math.h

593592

$(CC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $<

594593595594

# blake2s is auto-generated from blake2b

596-

$(srcdir)/Modules/_blake2/blake2s_impl.c: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2b_impl.c $(srcdir)/Modules/_blake2/blake2b2s.py

597-

$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Modules/_blake2/blake2b2s.py

598-

$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/clinic/clinic.py -f $@

595+

$(srcdir)/Modules/_blake2/blake2s_impl.c: $(srcdir)/Modules/_blake2/blake2b_impl.c $(srcdir)/Modules/_blake2/blake2b2s.py

596+

$(PYTHON_FOR_REGEN) $(srcdir)/Modules/_blake2/blake2b2s.py

597+

$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f $@

599598600599

# Build the shared modules

601600

# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for

@@ -733,7 +732,8 @@ regen-importlib: Programs/_freeze_importlib

733732

############################################################################

734733

# Regenerate all generated files

735734736-

regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast regen-importlib

735+

regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar \

736+

regen-ast regen-importlib clinic

737737738738

############################################################################

739739

# Special rules for object files