r19845 - gnucash-docs/trunk - Update documentation build system:

[Geert Janssens]

Author: gjanssens
Date: 2010-11-19 17:21:12 -0500 (Fri, 19 Nov 2010)
New Revision: 19845
Trac: http://svn.gnucash.org/trac/changeset/19845

Modified:
   gnucash-docs/trunk/Makefile.am
   gnucash-docs/trunk/configure.in
   gnucash-docs/trunk/guide/C/Makefile.am
   gnucash-docs/trunk/guide/de_DE/Makefile.am
   gnucash-docs/trunk/guide/it_IT/Makefile.am
   gnucash-docs/trunk/guide/ja_JP/Makefile.am
   gnucash-docs/trunk/help/C/Makefile.am
   gnucash-docs/trunk/help/de_DE/Makefile.am
   gnucash-docs/trunk/help/it_IT/Makefile.am
   gnucash-docs/trunk/pdf.make
   gnucash-docs/trunk/xmldocs.make
Log:
Update documentation build system:
- add configure test for fop, generate a warning if fop is missing
- fix autogen warning about duplicate CLEANFILES entries
- add pdf.make as dist file

Modified: gnucash-docs/trunk/Makefile.am
===================================================================
--- gnucash-docs/trunk/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -5,6 +5,7 @@
 	     COPYING-DOCS \
 	     xmldocs.make \
 	     omf.make \
+	     pdf.make \
 	     stylesheet \
 	     xsl \
 	     HACKING

Modified: gnucash-docs/trunk/configure.in
===================================================================
--- gnucash-docs/trunk/configure.in	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/configure.in	2010-11-19 22:21:12 UTC (rev 19845)
@@ -36,9 +36,17 @@
 dnl
 AC_PATH_PROG(XSLTPROC, xsltproc)
 if test -z "$XSLTPROC"; then
-  AC_MSG_ERROR([xsltproc not found])
+  AC_MSG_ERROR([xsltproc not found, perhaps you should install the libxslt package ?])
 fi
 
+dnl
+dnl Check for optional fop
+dnl
+AC_PATH_PROG(FOP, fop)
+if test -z "$FOP"; then
+  AC_MSG_WARN([fop not found. You will not be able to generate pdf files.])
+fi
+
 AC_OUTPUT(
 gnucash-docs.spec
 help/Makefile

Modified: gnucash-docs/trunk/guide/C/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/C/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/guide/C/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -25,7 +25,8 @@
 	appendixb.xml \
 	appendixc.xml \
 	appendixd.xml
+DISTCLEANFILES =  $(docname)-C.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
-dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-C.omf.out
\ No newline at end of file
+dist-hook: app-dist-hook
\ No newline at end of file

Modified: gnucash-docs/trunk/guide/de_DE/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/de_DE/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/guide/de_DE/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -10,7 +10,8 @@
  appendixe.xml \
  glossary.xml \
  index.xml
+DISTCLEANFILES =  $(docname)-de_DE.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
-dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-de_DE.omf.out
+dist-hook: app-dist-hook
\ No newline at end of file

Modified: gnucash-docs/trunk/guide/it_IT/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/it_IT/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/guide/it_IT/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -24,7 +24,8 @@
 	appendixb.xml \
 	appendixc.xml \
 	appendixd.xml
+DISTCLEANFILES =  $(docname)-it_IT.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
 dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-it_IT.omf.out

Modified: gnucash-docs/trunk/guide/ja_JP/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/ja_JP/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/guide/ja_JP/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -24,7 +24,8 @@
 	appendixb.xml \
 	appendixc.xml \
 	appendixd.xml
+DISTCLEANFILES =  $(docname)-ja_JP.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
 dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-ja_JP.omf.out
\ No newline at end of file

Modified: gnucash-docs/trunk/help/C/Makefile.am
===================================================================
--- gnucash-docs/trunk/help/C/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/help/C/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -18,7 +18,8 @@
 	Help_txf-categories.xml \
 	Help_fdl-appendix.xml \
         Help_tips-appendix.xml
+DISTCLEANFILES =  $(docname)-C.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
 dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-C.omf.out

Modified: gnucash-docs/trunk/help/de_DE/Makefile.am
===================================================================
--- gnucash-docs/trunk/help/de_DE/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/help/de_DE/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -8,7 +8,8 @@
 	chartofaccts.xml \
 	chtacctseg.xml \
 	txf-categories.xml
+DISTCLEANFILES =  $(docname)-de_DE.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
 dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-de_DE.omf.out

Modified: gnucash-docs/trunk/help/it_IT/Makefile.am
===================================================================
--- gnucash-docs/trunk/help/it_IT/Makefile.am	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/help/it_IT/Makefile.am	2010-11-19 22:21:12 UTC (rev 19845)
@@ -17,7 +17,8 @@
 	Help_txf-categories.xml \
 	Help_fdl-appendix.xml \
         Help_tips-appendix.xml
+DISTCLEANFILES =  $(docname)-it_IT.omf.out
+CLEANFILES =  $(DISTCLEANFILES)
 include $(top_srcdir)/xmldocs.make
 include $(top_srcdir)/pdf.make
 dist-hook: app-dist-hook
-DISTCLEANFILES =  $(docname)-it_IT.omf.out

Modified: gnucash-docs/trunk/pdf.make
===================================================================
--- gnucash-docs/trunk/pdf.make	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/pdf.make	2010-11-19 22:21:12 UTC (rev 19845)
@@ -2,9 +2,6 @@
 # 2010-11-19, Geert Janssens: Make the pdf create more universally usable.
 #
 # See README and HACKING.
-#
-# To do: Fix configure to find the right tools and pieces and make the target
-# if all parts are found.
 
 fofile  = $(docname).fo
 pdffile = $(docname).pdf
@@ -17,4 +14,4 @@
 .fo.pdf:
 	fop '$<' '$@'
 
-CLEANFILES = $(pdffile) $(fofile)
\ No newline at end of file
+CLEANFILES += $(pdffile) $(fofile)

Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make	2010-11-19 20:26:49 UTC (rev 19844)
+++ gnucash-docs/trunk/xmldocs.make	2010-11-19 22:21:12 UTC (rev 19845)
@@ -71,7 +71,7 @@
 	  done
 
 EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp $(docname)/*.html
+CLEANFILES += omf_timestamp $(docname)/*.html
 
 # If the following file is in a subdir (like help/) you need to add that to the path
 include $(top_srcdir)/omf.make