bgarrigues pushed a commit to branch automake2 in repository groff. commit 60a81f2861f97d1d891df7073ee53e38bdca8018 Author: Bertrand Garrigues <bertrand.garrig...@laposte.net> Date: Mon Sep 8 23:20:39 2014 +0200
Add automake conditionals plugged to the option --with-doc of configure, to decide whether or not to build some doc formats (pdf, html, examples) --- configure.ac | 8 ++++++++ contrib/chem/chem.am | 7 ++++++- contrib/hdtbl/hdtbl.am | 2 ++ contrib/mom/mom.am | 6 ++++++ contrib/pdfmark/pdfmark.am | 4 ++++ doc/doc.am | 25 ++++++++++++++++++++++++- 6 files changed, 50 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2b9f573..60de062 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,14 @@ gl_LOCALCHARSET # src/libs/libxutil AM_CONDITIONAL([WITHOUT_X11], [test "x$groff_no_x" = "xyes"]) +AM_CONDITIONAL([BUILD_INFODOC], [test -n $make_infodoc]) +AM_CONDITIONAL([BUILD_HTML], [test -n $make_htmldoc]) +AM_CONDITIONAL([BUILD_HTMLEXAMPLES], [test -n $make_htmlexamples]) +AM_CONDITIONAL([BUILD_PDFDOC], [test -n $make_pdfdoc]) +AM_CONDITIONAL([BUILD_PDFEXAMPLES], [test -n $make_pdfexamples]) +AM_CONDITIONAL([BUILD_OTHERDOC], [test -n $make_otherdoc]) +AM_CONDITIONAL([BUILD_EXAMPLES], [test -n $make_examples]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am index 053cc7b..4f59a71 100644 --- a/contrib/chem/chem.am +++ b/contrib/chem/chem.am @@ -41,6 +41,7 @@ CHEM_EXAMPLES = \ contrib/chem/examples/penicillin.chem \ contrib/chem/examples/reserpine.chem +if BUILD_EXAMPLES # Files installed in $(exampledir)/chem chemexampledir = $(exampledir)/chem nodist_chemexample_DATA = $(CHEM_GENEXAMPLES) @@ -50,7 +51,7 @@ dist_chemexample_DATA = $(CHEM_EXAMPLES) # lazily installed by the local install target chemexample122dir = $(chemexampledir)/122 nodist_chemexample122_DATA = contrib/chem/examples/122/README - +endif EXTRA_DIST += \ contrib/chem/ChangeLog \ contrib/chem/chem.man \ @@ -93,20 +94,24 @@ chem: $(chem_srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT) install-data-local: install_chem_extra install_chem_extra: +if BUILD_EXAMPLES -test -d $(DESTDIR)$(chemexample122dir) \ || $(mkinstalldirs) $(DESTDIR)$(chemexample122dir); for i in $(chem_srcdir)/examples/122/*.chem; do \ n=`echo $$i | sed 's|$(chem_srcdir)/examples/122/||g'`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(chemexample122dir)/$$n; \ done +endif uninstall-local: uninstall_chem_extra uninstall_chem_extra: +if BUILD_EXAMPLES rm -f $(DESTDIR)$(exampledir)/chem/122/* -rmdir $(DESTDIR)$(exampledir)/chem/122 rm -f $(DESTDIR)$(exampledir)/chem/* -rmdir $(DESTDIR)$(exampledir)/chem -rmdir $(DESTDIR)$(datasubdir)/pic +endif dist-hook: dist_chem dist_chem: diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am index 73f6557..0a35f03 100644 --- a/contrib/hdtbl/hdtbl.am +++ b/contrib/hdtbl/hdtbl.am @@ -76,7 +76,9 @@ HDTBLPROCESSEDEXAMPLEFILES = \ hdtblexampledir = $(exampledir)/hdtbl dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES) nodist_hdtblexample_DATA = $(HDTBLGENFILES) +if BUILD_EXAMPLES nodist_hdtblexample_DATA += $(HDTBLPROCESSEDEXAMPLEFILES) gnu.eps +endif $(hdtblexample_DATA): $(HDTBLSTRIPFILES) MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \ diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am index 2c2a4e4..30f28d3 100644 --- a/contrib/mom/mom.am +++ b/contrib/mom/mom.am @@ -44,6 +44,7 @@ nodist_momtmac_DATA = $(MOMSTRIPFILES) dist_momtmac_DATA = $(MOMNORMALFILES) # Files installed in htmldocdir/mom +if BUILD_HTML MOMHTMLDOCFILES=\ contrib/mom/momdoc/stylesheet.css \ contrib/mom/momdoc/appendices.html \ @@ -70,6 +71,7 @@ MOMHTMLDOCFILES=\ contrib/mom/momdoc/version-2.html momhtmldir = $(htmldocdir)/mom momhtml_DATA = $(MOMHTMLDOCFILES) +endif # Files installed in $(examplesdir)/mom. MOMEXAMPLEFILES are located # in the source tree, while MOMPROCESSEDEXAMPLEFILES are generated in @@ -88,6 +90,7 @@ MOMEXAMPLEFILES=\ momexampledir = $(exampledir)/mom momexample_DATA = $(MOMEXAMPLEFILES) +if BUILD_PDFEXAMPLES MOMPROCESSEDEXAMPLEFILES = \ contrib/mom/examples/letter.pdf \ contrib/mom/examples/mom-pdf.pdf \ @@ -95,6 +98,7 @@ MOMPROCESSEDEXAMPLEFILES = \ contrib/mom/examples/typesetting.pdf momprocessedexampledir = $(exampledir)/mom nodist_momprocessedexample_DATA = $(MOMPROCESSEDEXAMPLEFILES) +endif # For this list of files we add a symlink from $(exampledir)/mom to $(pdfdocdir) PDFDOCFILE = mom-pdf.pdf @@ -136,10 +140,12 @@ $(MOMSTRIPFILES): $(top_srcdir)/tmac/strip.sed install-data-hook: install_mom install_mom: +if BUILD_PDFEXAMPLES for f in $(PDFDOCFILE); do \ rm -f $(DESTDIR)$(pdfdocdir)/$$f; \ ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f; \ done +endif uninstall_groffdirs: uninstall_mom uninstall_mom: diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am index ec2548f..1963597 100644 --- a/contrib/pdfmark/pdfmark.am +++ b/contrib/pdfmark/pdfmark.am @@ -32,11 +32,15 @@ pdfmarktmacdir = $(tmacdir) dist_pdfmarktmac_DATA = $(TMACFILES) # Files installed in $(pdfdocdir) +if BUILD_PDFDOC PDFDOCFILES = \ contrib/pdfmark/pdfmark.pdf pdfmarkpdfdocdir = $(pdfdocdir) dist_pdfmarkpdfdoc_DATA = $(PDFDOCFILES) MOSTLYCLEANFILES += $(PDFDOCFILES) +else +EXTRA_DIST += $(PDFDOCFILES) +endif EXTRA_DIST += \ contrib/pdfmark/cover.ms \ diff --git a/doc/doc.am b/doc/doc.am index fa247ca..bf04465 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -28,6 +28,7 @@ DOC_GROFF=\ $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) $(TFLAG) $(FFLAG) -Upet -ww # Other doc, installed in $(docdir) +if BUILD_OTHERDOC # Files located in the source tree DOCFILES= \ doc/meref.me \ @@ -45,15 +46,20 @@ otherdocdir = $(docdir) dist_otherdoc_DATA = $(DOCFILES) nodist_otherdoc_DATA = $(PROCESSEDDOCFILES) MOSTLYCLEANFILES += $(PROCESSEDDOCFILES) +else +EXTRA_DIST += $(DOCFILES) +endif # GNU PIC html documentation, installed in $(htmldocdir) # Other pic*.html files are installed by the local rule +if BUILD_HTML HTMLDOCFILES = \ doc/pic.html htmlpicdir = $(htmldocdir) htmlpic_DATA = $(HTMLDOCFILES) HTMLDOCFILESALL = pic*.html HTMLDOCIMAGEFILES = pic* +endif # Examples files, installed in $(exampledir) @@ -64,6 +70,7 @@ EXAMPLEFILES = \ doc/grnexmpl.g \ doc/grnexmpl.me +if BUILD_EXAMPLES # Generated in the build tree PROCESSEDEXAMPLEFILES = \ doc/webpage.ps \ @@ -76,6 +83,9 @@ docexamplesdir = $(exampledir) dist_docexamples_DATA = $(EXAMPLEFILES) nodist_docexamples_DATA = $(HTMLEXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) MOSTLYCLEANFILES += $(PROCESSEDEXAMPLEFILES) +else +EXTRA_DIST += $(EXAMPLEFILES) +endif imagedir = img htmldocimagedir = $(htmldocdir)/img @@ -143,6 +153,7 @@ doc/grnexmpl.ps: doc/grnexmpl.me doc/grnexmpl.g # Note that we remove groff.css only if out-of-source build tree mostlyclean-local: mostlyclean_doc mostlyclean_doc: +if BUILD_HTML if test -d $(doc_builddir); then \ cd $(doc_builddir) && \ for f in $(HTMLDOCFILESALL); do \ @@ -155,10 +166,12 @@ mostlyclean_doc: rm -f $$f; \ done; \ fi +endif if test $(top_builddir) != $(top_srcdir); then \ rm -f $(top_builddir)/doc/groff.css; \ fi +if BUILD_EXAMPLES if test -d $(doc_builddir); then \ cd $(doc_builddir) && \ for f in $(HTMLEXAMPLEFILESALL); do \ @@ -171,9 +184,11 @@ mostlyclean_doc: rm -f $$f; \ done; \ fi +endif install-data-hook: install_doc_htmldoc install_doc_htmldoc: +if BUILD_HTML cd $(doc_builddir) && \ for f in `ls $(HTMLDOCFILESALL)`; do \ rm -f $(DESTDIR)$(htmldocdir)/$$f; \ @@ -184,9 +199,10 @@ install_doc_htmldoc: rm -f $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES) $(INSTALL_DATA) $(doc_builddir)/$(imagedir)/$(HTMLDOCIMAGEFILES) \ $(DESTDIR)$(htmldocimagedir) +endif install-data-hook: install_doc_examples - +if BUILD_EXAMPLES install_doc_examples: gnu.eps # Prefer gnu.eps in builddir over srcdir. d=.; test -f "gnu.eps" || d=$(doc_srcdir); \ @@ -202,9 +218,13 @@ install_doc_examples: gnu.eps rm -f $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES) $(INSTALL_DATA) $(doc_builddir)/$(imagedir)/$(HTMLEXAMPLEIMAGEFILES) \ $(DESTDIR)$(exampleimagedir) +else +install_doc_examples: +endif uninstall-hook: uninstall_doc_examples uninstall_doc_htmldoc uninstall_mom uninstall_doc_examples: +if BUILD_EXAMPLES -test -d $(DESTDIR)$(docexamplesdir) && \ cd $(DESTDIR)$(docexamplesdir) && \ for f in $(HTMLEXAMPLEFILESALL); do \ @@ -218,8 +238,10 @@ uninstall_doc_examples: rm -f $(DESTDIR)$(exampledir)/gnu.eps -rmdir $(DESTDIR)$(docexamplesdir)/$(imagedir) -rmdir $(DESTDIR)$(docexamplesdir) +endif uninstall_doc_htmldoc: +if BUILD_HTML -test -d $(DESTDIR)$(htmldocdir) && \ cd $(DESTDIR)$(htmldocdir) && \ for f in $(HTMLDOCFILESALL); do \ @@ -232,6 +254,7 @@ uninstall_doc_htmldoc: done -rmdir $(DESTDIR)$(htmldocdir)/$(imagedir) -rmdir $(DESTDIR)$(htmldocdir) +endif # Texinfo doc # _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit