doc: Fix races in a parallel build.

* configure.ac: Use AC_PROG_MKDIR_P macro.
* doc/Makefile.am (stamp_functions, stamp_enums): Use the MKDIR_P
variable it defines.
(error_codes.texi, algorithms.texi, alerts.texi): Add dependency on
errcodes via a prerequisite, not a make invocation
(DISTCLEANFILES): Register the newly depended upon binaries.

Fixes: <https://gitlab.com/gnutls/gnutls/-/issues/1635>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

diff --git a/configure.ac b/configure.ac
index 5e0a37d95398b23814bb3eecc5ba2868decd619d..ba9b92c779016b4081c99234380fcaa978255a4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ AM_PROG_AS
 AM_PROG_AR
 AC_PROG_CXX
 AM_PROG_CC_C_O
+AC_PROG_MKDIR_P
 AC_PROG_YACC
 AC_PROG_SED
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index af7431961c22ff78401205e9a5f88569e8f2b48b..af167489855d97629cd288ade2906d3e2b6da7b6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -419,18 +419,15 @@ printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
 alert_printlist_SOURCES = alert-printlist.c common.c common.h
 alert_printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
 
-error_codes.texi: $(top_srcdir)/lib/errors.c $(srcdir)/errcodes.c
-       $(MAKE) $(builddir)/errcodes
+error_codes.texi: $(top_srcdir)/lib/errors.c errcodes
        $(builddir)/errcodes > $@-tmp
        mv -f $@-tmp $@
 
-algorithms.texi: $(top_srcdir)/lib/algorithms/ciphers.c $(srcdir)/printlist.c
-       $(MAKE) $(builddir)/printlist
+algorithms.texi: $(top_srcdir)/lib/algorithms/ciphers.c printlist
        $(builddir)/printlist > $@-tmp
        mv -f $@-tmp $@
 
-alerts.texi: $(top_srcdir)/lib/alert.c $(srcdir)/alert-printlist.c
-       $(MAKE) $(builddir)/alert-printlist
+alerts.texi: $(top_srcdir)/lib/alert.c alert-printlist
        $(builddir)/alert-printlist > $@-tmp
        mv -f $@-tmp $@
 
@@ -444,11 +441,12 @@ enums.texi: $(HEADER_FILES)
        mv -f $@-tmp $@
 
 gnutls_TEXINFOS += $(ENUMS) $(FUNCS) $(AUTOGENED_DOC)
-DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions
+DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions \
+  errcodes printlist alert-printlist
 
 
 stamp_functions: $(API_FILES)
-       -mkdir functions
+       $(MKDIR_P) functions
        -rm -f functions/*.short
        for i in $^; do \
                $(PERL) $(srcdir)/scripts/split-texi.pl functions < $$i; \
@@ -459,7 +457,7 @@ stamp_functions: $(API_FILES)
        echo $@ > $@
 
 stamp_enums: enums.texi
-       -mkdir enums
+       $(MKDIR_P) enums
        $(PERL) $(srcdir)/scripts/split-texi.pl enums enum < $<
        echo $@ > $@