From: Daiki Ueno Date: Fri, 7 Feb 2025 22:58:34 +0000 (+0900) Subject: Revert "doc: Fix races in a parallel build." X-Git-Tag: 3.8.9^2~1 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5300a8683d937ccf09ed01170d3bcb93d97ed605;p=thirdparty%2Fgnutls.git 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 --- diff --git a/configure.ac b/configure.ac index eb7280f0bd..4838ce2c80 100644 --- 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 bd111fa11b..3380d16bbb 100644 --- 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 $@ > $@