Try to fix parallel build problems by moving makedoc to doc/.

This also requires to move Muttrc into doc/.

diff --git a/Makefile.am b/Makefile.am
index 670e3e7ddbdba59c53049326706deae1769049ca..1cf3d6e6d0405e23c6c11e1663d721af7f5f5ef9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 ## Use aclocal -I m4; automake --foreign
 
 AUTOMAKE_OPTIONS = 1.6 foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc
+EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap
 
 if BUILD_IMAP
 IMAP_SUBDIR = imap
@@ -39,17 +39,6 @@ mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
 mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
        $(INTLDEPS)
 
-makedoc_SOURCES = makedoc.c
-makedoc_LDADD =
-makedoc_DEPENDENCIES = 
-
-# $(makedoc_OBJECTS): $(makedoc_SOURCES)
-#      $(HOST_CC) $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
-
-# makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-#      @rm -rf makedoc
-#      $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
-
 DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
        -DHAVE_CONFIG_H=1
@@ -76,8 +65,8 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
        mx.h pager.h pgp.h pop.h protos.h rfc1524.h rfc2047.h \
        rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \
        _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
-       mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc \
-       makedoc.c makedoc-defs.h stamp-doc-rc README.SSL smime.h \
+       mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \
+       README.SSL smime.h \
        muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
        ChangeLog ChangeLog.old mkchangelog.sh mutt_idna.h \
        snprintf.c regex.c crypt-gpgme.h hcachever.sh.in
@@ -95,9 +84,9 @@ pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 mutt_dotlock.c: dotlock.c
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
-CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc keymap_alldefs.h $(BUILT_SOURCES)
+CLEANFILES = mutt_dotlock.c keymap_alldefs.h $(BUILT_SOURCES)
 
-DISTCLEANFILES= flea Muttrc smime_keys
+DISTCLEANFILES= flea smime_keys
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -144,23 +133,15 @@ install-exec-hook:
                { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
        fi
 
-install-data-local: Muttrc
+install-data-local:
        $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-       $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
        $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
-       -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
-               mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
-       elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
-               mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
-       elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
-               $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
-       fi
        -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
                $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
        fi
 
 uninstall-local:
-       for i in Muttrc mime.types ; do \
+       for i in mime.types ; do \
                if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \
                        rm $(DESTDIR)$(sysconfdir)/$$i ; \
                fi ; \
@@ -192,18 +173,8 @@ update-changelog:
 mutt-dist:
        (cd $(srcdir) && ./build-release )
 
-update-doc: stamp-doc-rc
+update-doc:
        (cd doc && $(MAKE) update-doc)
 
-Muttrc: stamp-doc-rc
-
-stamp-doc-rc: $(srcdir)/init.h $(srcdir)/makedoc-defs.h makedoc Muttrc.head
-       -rm -f Muttrc stamp-doc-rc
-       sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
-       $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-               $(srcdir)/init.h | ./makedoc -c >> Muttrc
-       touch stamp-doc-rc
-
-
 .PHONY: commit pclean check-security commit-real commit-changelog
 # .PHONY: changelog ChangeLog

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 57dde87f4b2eebb22c922cbccd7902b7134ca57b..89f865fa2675c9eb8e182052f2f9741239818bbb 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,6 +7,8 @@ AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir)
 
 MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C
 
+noinst_PROGRAMS = makedoc
+
 EXTRA_DIST = dotlock.man               \
        muttbug.man                     \
        mutt.man                        \
@@ -23,6 +25,8 @@ EXTRA_DIST = dotlock.man              \
        instdoc.sh.in                   \
        patch-notes.txt                 \
        smime-notes.txt                 \
+       Muttrc Muttrc.head stamp-doc-rc \
+       makedoc.c makedoc-defs.h        \
        html.xsl chunk.xsl $(BUILT_DISTFILES)
 
 HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
@@ -38,14 +42,14 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog        \
        ChangeLog.old                                   \
        README NEWS TODO README.SECURITY README.SSL 
 
-all:
-       $(MAKE) makedoc-all
+all: makedoc-all
 
 makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
 
 install-data-local: makedoc-all instdoc
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
        ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
@@ -65,6 +69,14 @@ install-data-local: makedoc-all instdoc
        -for f in $(HTML_DOCFILES) ; do \
                $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
        done
+       $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+       -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+               mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
+       elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
+               mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
+       elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
+               $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
+       fi
 
 uninstall-local:
        for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
@@ -78,6 +90,12 @@ uninstall-local:
                rm -f $(DESTDIR)$(docdir)/$$f ; \
        done
        -rm -f $(DESTDIR)$(docdir)/manual.txt
+       for i in Muttrc ; do \
+         if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \
+               rm $(DESTDIR)$(sysconfdir)/$$i ; \
+         fi ; \
+         rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \
+       done
 
 check:
 manual.txt: manual.html
@@ -85,6 +103,15 @@ manual.txt: manual.html
        w3m -dump $^ > $@ || \
        elinks -dump -no-numbering -no-references $^ > $@
 
+Muttrc: stamp-doc-rc
+
+stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
+       -rm -f Muttrc stamp-doc-rc
+       sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
+       $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
+         $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
+       touch stamp-doc-rc
+
 manual.html: $(srcdir)/html.xsl stamp-doc-xml
        -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 
@@ -109,19 +136,17 @@ clean-local:
        rm -f *~ *.html *.orig *.rej  stamp-doc-* *.ps mutt.1 muttrc.man
        rm -f *.aux *.log *.tex *.out
 
-DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html instdoc
+DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
+              instdoc Muttrc
 
 instdoc: instdoc.sh
        cat instdoc.sh > instdoc
        chmod a+x instdoc
 
-../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
-       (cd .. && $(MAKE) makedoc$(EXEEXT))
-
-update-doc: stamp-doc-xml stamp-doc-chunked manual.txt manual.html
+update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-rc manual.txt manual.html
 
-muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
-       $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m |       \
+muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
+       $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m |       \
                cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
                > muttrc.man
 
@@ -132,13 +157,12 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
 mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
 
-stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
+stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
-       $(MAKE) ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
        ( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
          sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
-         $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
+         $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \
          $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \
            perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/OPS* \
        ) > manual.xml

diff --git a/Muttrc.head b/doc/Muttrc.head
similarity index 100%
rename from Muttrc.head
rename to doc/Muttrc.head

diff --git a/makedoc-defs.h b/doc/makedoc-defs.h
similarity index 100%
rename from makedoc-defs.h
rename to doc/makedoc-defs.h

diff --git a/makedoc.c b/doc/makedoc.c
similarity index 100%
rename from makedoc.c
rename to doc/makedoc.c

diff --git a/functions.h b/functions.h
index 0464bb175be48f86b88510129811b96c148bd268..fb52018f38be902d82bacb022738b368e640e1a9 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -35,7 +35,7 @@
 
 #ifdef _MAKEDOC
 # include "config.h"
-# include "makedoc-defs.h"
+# include "doc/makedoc-defs.h"
 #endif
 
 struct binding_t OpGeneric[] = { /* map: generic */

diff --git a/init.h b/init.h
index 1ae3d817920fbcf418fb9caf366159ad10aa8581..2b65ddc72d0b215c81ddb39ee87b07f611a7313e 100644 (file)
--- a/init.h
+++ b/init.h
@@ -19,7 +19,7 @@
 
 #ifdef _MAKEDOC
 # include "config.h"
-# include "makedoc-defs.h"
+# include "doc/makedoc-defs.h"
 #else
 # include "sort.h"
 #endif