[gnumeric] distcheck: move stuff out of doc/C/Makefile.am

[Morten Welinder <mortenw src gnome org>]

commit b1990f1a5bd8eb1a5e009ccaf9d7fbffa8733b50
Author: Morten Welinder <terra gnome org>
Date:   Mon Jan 30 16:02:48 2017 -0500

    distcheck: move stuff out of doc/C/Makefile.am
    
    Yelp cannot handle the existance of doc/C in the distcheck phase.

 configure.ac             |    1 -
 doc/C/Makefile.am        |   60 -------------------------------------------
 doc/Makefile.am          |   64 +++++++++++++++++++++++++++++++++++++++++++++-
 doc/{C => }/gnumeric.1   |    0
 doc/{C => }/ssconvert.1  |    0
 doc/{C => }/ssdiff.1     |    0
 doc/{C => }/ssgrep.1     |    0
 doc/{C => }/ssindex.1    |    0
 doc/{C => }/textdefs.tex |    0
 9 files changed, 63 insertions(+), 62 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 65c3898..19bbd0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1153,7 +1153,6 @@ src/widgets/Makefile
 src/tools/Makefile
 src/cut-n-paste-code/Makefile
 doc/Makefile
-doc/C/Makefile
 plugins/Makefile
 plugins/fn-christian-date/Makefile
 plugins/fn-complex/Makefile
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 20c2950..49c722f 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -3,65 +3,5 @@
 noinst_DATA=
 EXTRA_DIST=
 
-if ENABLE_PDFDOCS
-noinst_DATA += gnumeric.pdf
-endif
-
-if ENABLE_PDF_VIA_DBCONTEXT
-gnumeric.pdf:
-       env TEXINPUTS=$(srcdir):.: dbcontext -t tex -Pfo.setup=1 -I . \
-               -P imagedata.default.scale='scale=600' \
-               -o gnumeric.tex $(srcdir)/gnumeric.xml
-       sed -i -e 's/\xE2\xA8\x89/\\ensuremath{\\times}/' gnumeric.tex
-       sed -i -e 's/\\begin{verbatim}\([^_]*\)\\end{verbatim}/\\texttt{\1}/g' gnumeric.tex
-       sed -i -e 's/\\texttt{\\emph{\\small{\(.*\)}}}:/\\texttt{\\emph{\1}}:/g' gnumeric.tex
-       sed -i -e 's/ *>{} */\\ensuremath{{}>{}}/g' gnumeric.tex
-       sed -i -e 's/ *<{} */\\ensuremath{{}<{}}/g' gnumeric.tex
-       sed -i -e 's/\\makeglossary/\\makeglossary\n\\setlength{\\headheight}{36pt}/g' gnumeric.tex
-       env TEXMFCNF=$(srcdir): \
-               TEXINPUTS=$(srcdir):/usr/share/texmf/tex/context/dbcontext/style: \
-               texexec --pdf --mode=A4 --verbose gnumeric.tex
-endif
-
-if ENABLE_PDF_VIA_DBLATEX
-gnumeric.pdf:
-       dblatex -t tex -Pfo.setup=1 -I . \
-               -P imagedata.default.scale='scale=0.6' \
-               -P latex.encoding=utf8 \
-               -P latex.output.revhistory=0 \
-               -o gnumeric.tex $(srcdir)/gnumeric.xml
-       sed -i -e 's/\xE2\xA8\x89/\\ensuremath{\\times}/' gnumeric.tex
-       sed -i -e 's/\\begin{verbatim}\([^_]*\)\\end{verbatim}/\\texttt{\1}/g' gnumeric.tex
-       sed -i -e 's/\texttt{\emph{\small{\(.*\)}}}:/\texttt{\emph{\1}}:/g' gnumeric.tex
-       sed -i -e 's/ *>{} */\\ensuremath{{}>{}}/g' gnumeric.tex
-       sed -i -e 's/ *<{} */\\ensuremath{{}<{}}/g' gnumeric.tex
-       sed -i -e 's/\\makeglossary/\\makeglossary\n\\setlength{\\headheight}{36pt}\n\\input{textdefs.tex}/g' 
gnumeric.tex
-       for runs in $$(seq 1 4); do \
-               env TEXINPUTS=$(srcdir): \
-                       pdflatex -interaction nonstopmode gnumeric.tex ; \
-       done
-endif
-
-manpagedir   = $(mandir)/man1
-manpage_DATA = gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1 ssdiff.1
-
-winhelp_DATA =
-winhelpdir=$(gnumeric_datadir)/$(subdir)
-if WITH_WIN32
-winhelp_DATA += gnumeric.chm gnumeric.hhmap
-
-gnumeric.hhmap: chm-stamp
-       -(cd chm && wine 'C:\Program Files\HTML Help Workshop\hhc.exe' gnumeric.hhp)
-       cp chm/gnumeric.hhmap .
-
-gnumeric.chm: gnumeric.hhmap
-       cp chm/gnumeric.chm .
-
-endif
-
 EXTRA_DIST += $(manpage_DATA) \
        gnumeric-docbook-2-htmlhelp.xsl
-
-if ENABLE_PDFDOCS
-EXTRA_DIST += gnumeric.pdf
-endif
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 888e7ed..7e3f9a4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,9 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = C
+SUBDIRS =
 EXTRA_DIST=
+noinst_DATA=
+DISTCLEANFILES=
 
 @YELP_HELP_RULES@
 
@@ -552,3 +554,63 @@ func.defs: $(top_builddir)/src/gnumeric$(EXEEXT)
        LC_ALL="$(locale)" ; export LC_ALL ; $(top_builddir)/src/gnumeric --dump-func-defs="$@"
 
 EXTRA_DIST+=func.defs
+DISTCLEANFILES+=func.defs
+
+EXTRA_DIST+=textdefs.tex
+if ENABLE_PDFDOCS
+noinst_DATA += gnumeric.pdf
+EXTRA_DIST += gnumeric.pdf
+endif
+
+if ENABLE_PDF_VIA_DBCONTEXT
+gnumeric.pdf:
+       (cd C && env TEXINPUTS=$(srcdir):.: dbcontext -t tex -Pfo.setup=1 -I . \
+               -P imagedata.default.scale='scale=600' \
+               -o ../gnumeric.tex $(srcdir)/gnumeric.xml)
+       sed -i -e 's/\xE2\xA8\x89/\\ensuremath{\\times}/' gnumeric.tex
+       sed -i -e 's/\\begin{verbatim}\([^_]*\)\\end{verbatim}/\\texttt{\1}/g' gnumeric.tex
+       sed -i -e 's/\\texttt{\\emph{\\small{\(.*\)}}}:/\\texttt{\\emph{\1}}:/g' gnumeric.tex
+       sed -i -e 's/ *>{} */\\ensuremath{{}>{}}/g' gnumeric.tex
+       sed -i -e 's/ *<{} */\\ensuremath{{}<{}}/g' gnumeric.tex
+       sed -i -e 's/\\makeglossary/\\makeglossary\n\\setlength{\\headheight}{36pt}/g' gnumeric.tex
+       env TEXMFCNF=$(srcdir): \
+               TEXINPUTS=$(srcdir):/usr/share/texmf/tex/context/dbcontext/style: \
+               texexec --pdf --mode=A4 --verbose gnumeric.tex
+endif
+
+if ENABLE_PDF_VIA_DBLATEX
+gnumeric.pdf:
+       (cd C && dblatex -t tex -Pfo.setup=1 -I . \
+               -P imagedata.default.scale='scale=0.6' \
+               -P latex.encoding=utf8 \
+               -P latex.output.revhistory=0 \
+               -o ../gnumeric.tex $(srcdir)/gnumeric.xml)
+       sed -i -e 's/\xE2\xA8\x89/\\ensuremath{\\times}/' gnumeric.tex
+       sed -i -e 's/\\begin{verbatim}\([^_]*\)\\end{verbatim}/\\texttt{\1}/g' gnumeric.tex
+       sed -i -e 's/\texttt{\emph{\small{\(.*\)}}}:/\texttt{\emph{\1}}:/g' gnumeric.tex
+       sed -i -e 's/ *>{} */\\ensuremath{{}>{}}/g' gnumeric.tex
+       sed -i -e 's/ *<{} */\\ensuremath{{}<{}}/g' gnumeric.tex
+       sed -i -e 's/\\makeglossary/\\makeglossary\n\\setlength{\\headheight}{36pt}\n\\input{textdefs.tex}/g' 
gnumeric.tex
+       for runs in $$(seq 1 4); do \
+               env TEXINPUTS=$(srcdir): \
+                       pdflatex -interaction nonstopmode gnumeric.tex ; \
+       done
+endif
+
+manpagedir   = $(mandir)/man1
+manpage_DATA = gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1 ssdiff.1
+EXTRA_DIST += $(manpage_DATA)
+
+winhelp_DATA =
+winhelpdir=$(gnumeric_datadir)/$(subdir)
+if WITH_WIN32
+winhelp_DATA += gnumeric.chm gnumeric.hhmap
+
+gnumeric.hhmap: chm-stamp
+       -(cd C/chm && wine 'C:\Program Files\HTML Help Workshop\hhc.exe' gnumeric.hhp)
+       cp C/chm/gnumeric.hhmap .
+
+gnumeric.chm: gnumeric.hhmap
+       cp C/chm/gnumeric.chm .
+
+endif
diff --git a/doc/C/gnumeric.1 b/doc/gnumeric.1
similarity index 100%
rename from doc/C/gnumeric.1
rename to doc/gnumeric.1
diff --git a/doc/C/ssconvert.1 b/doc/ssconvert.1
similarity index 100%
rename from doc/C/ssconvert.1
rename to doc/ssconvert.1
diff --git a/doc/C/ssdiff.1 b/doc/ssdiff.1
similarity index 100%
rename from doc/C/ssdiff.1
rename to doc/ssdiff.1
diff --git a/doc/C/ssgrep.1 b/doc/ssgrep.1
similarity index 100%
rename from doc/C/ssgrep.1
rename to doc/ssgrep.1
diff --git a/doc/C/ssindex.1 b/doc/ssindex.1
similarity index 100%
rename from doc/C/ssindex.1
rename to doc/ssindex.1
diff --git a/doc/C/textdefs.tex b/doc/textdefs.tex
similarity index 100%
rename from doc/C/textdefs.tex
rename to doc/textdefs.tex