Revert "doc: Fix races in a parallel build."

This reverts commit 8daba130cc0c4100186af0b61bc3e65d54a46727, which
turned out to cause a rebuild of .info files at "make distcheck" in a
read-only srcdir.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/configure.ac b/configure.ac
index eb7280f0bd060dc0b08a203e8f1fadf4009d735f..4838ce2c80598d5944dcb8f9019c15797480d093 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,6 @@ 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 bd111fa11b6fb477f3e2e7f454910539885daf89..3380d16bbbbcc7d2dbff9246c723fb191c2a6c77 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -419,15 +419,18 @@ 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 errcodes
+error_codes.texi: $(top_srcdir)/lib/errors.c $(srcdir)/errcodes.c
+       $(MAKE) $(builddir)/errcodes
        $(builddir)/errcodes > $@-tmp
        mv -f $@-tmp $@
 
-algorithms.texi: $(top_srcdir)/lib/algorithms/ciphers.c printlist
+algorithms.texi: $(top_srcdir)/lib/algorithms/ciphers.c $(srcdir)/printlist.c
+       $(MAKE) $(builddir)/printlist
        $(builddir)/printlist > $@-tmp
        mv -f $@-tmp $@
 
-alerts.texi: $(top_srcdir)/lib/alert.c alert-printlist
+alerts.texi: $(top_srcdir)/lib/alert.c $(srcdir)/alert-printlist.c
+       $(MAKE) $(builddir)/alert-printlist
        $(builddir)/alert-printlist > $@-tmp
        mv -f $@-tmp $@
 
@@ -441,12 +444,11 @@ enums.texi: $(HEADER_FILES)
        mv -f $@-tmp $@
 
 gnutls_TEXINFOS += $(ENUMS) $(FUNCS) $(AUTOGENED_DOC)
-DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions \
-  errcodes printlist alert-printlist
+DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions
 
 
 stamp_functions: $(API_FILES)
-       $(MKDIR_P) functions
+       -mkdir functions
        -rm -f functions/*.short
        for i in $^; do \
                $(PERL) $(srcdir)/scripts/split-texi.pl functions < $$i; \
@@ -457,7 +459,7 @@ stamp_functions: $(API_FILES)
        echo $@ > $@
 
 stamp_enums: enums.texi
-       $(MKDIR_P) enums
+       -mkdir enums
        $(PERL) $(srcdir)/scripts/split-texi.pl enums enum < $<
        echo $@ > $@