[svn] GnuPG - r4364 - branches/STABLE-BRANCH-1-4/doc

[svn author wk]

Author: wk
Date: 2006-12-04 14:51:18 +0100 (Mon, 04 Dec 2006)
New Revision: 4364

Added:
   branches/STABLE-BRANCH-1-4/doc/yat2m.c
Removed:
   branches/STABLE-BRANCH-1-4/doc/gpg.sgml
   branches/STABLE-BRANCH-1-4/doc/gpg.texi
   branches/STABLE-BRANCH-1-4/doc/gpgv.sgml
   branches/STABLE-BRANCH-1-4/doc/gpgv.texi
Modified:
   branches/STABLE-BRANCH-1-4/doc/ChangeLog
   branches/STABLE-BRANCH-1-4/doc/Makefile.am
Log:
Changing the way man pages are build.


Modified: branches/STABLE-BRANCH-1-4/doc/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/ChangeLog	2006-12-04 01:20:55 UTC (rev 4363)
+++ branches/STABLE-BRANCH-1-4/doc/ChangeLog	2006-12-04 13:51:18 UTC (rev 4364)
@@ -1,3 +1,7 @@
+2006-12-04  Werner Koch  <wk at g10code.com>
+
+	* yat2m.c: New.
+
 2006-06-22  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpg.sgml: Document --enable-dsa2, --disable-dsa2, and

Modified: branches/STABLE-BRANCH-1-4/doc/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/Makefile.am	2006-12-04 01:20:55 UTC (rev 4363)
+++ branches/STABLE-BRANCH-1-4/doc/Makefile.am	2006-12-04 13:51:18 UTC (rev 4364)
@@ -20,14 +20,20 @@
 
 AUTOMAKE_OPTIONS = no-texinfo.tex
 
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html \
+EXTRA_DIST = DETAILS gpg.1 gpgv.1 faq.raw FAQ faq.html \
              HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
              TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
 
-man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1
+noinst_PROGRAMS = yat2m
 
-info_TEXINFOS = gpg.texi gpgv.texi
+myman_sources = gpg.texi 
+myman_pages   = gpg.1 
 
+info_TEXINFOS = gpg.texi
+
+man_MANS = $(myman_pages) gnupg.7 gpg.ru.1
+
+
 # Need this to avoid building of dvis with automake 1.4
 DVIS =
 
@@ -38,27 +44,37 @@
 # be built files. 
 
 CLEANFILES = faq.raw.xref gpg.xml gpgv.xml gpg.ru.xml
+DISTCLEANFILES = yat2m-stamp.tmp yat2m-stamp $(myman_pages)
 
+YAT2M_OPTIONS = -I $(srcdir) -D gpgone \
+        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
 
-# We better build the texi versions manually.
-#%.texi : %.xml
-#if HAVE_DOCBOOK_TO_TEXI
-#	 docbook2texi $< | sed 's,--,---,' \
-#	    | $(top_srcdir)/scripts/fix-db-texi $@  >$@
-#else
-#	 : Warning: missing docbook to texinfo tools, cannot make $@
-#	 touch $@
-#endif
-#
-#%.xml : %.sgml
-#if HAVE_DOCBOOK_TO_TEXI
-#	 sgml2xml -x lower $< >$@
-#else
-#	 : Warning: missing docbook to texinfo tools, cannot make $@
-#	 touch $@
-#endif
-#
+yat2m_SOURCES = yat2m.c
 
+yat2m-stamp: $(myman_sources)
+	@rm -f yat2m-stamp.tmp
+	@touch yat2m-stamp.tmp
+	for file in $(myman_sources) ; do \
+              ./yat2m $(YAT2M_OPTIONS) --store \
+	          `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+	@mv -f yat2m-stamp.tmp $@
+
+yat2m-stamp: yat2m
+
+$(myman_pages) : yat2m-stamp
+	@if test -f $@; then :; else \
+            trap 'rm -rf yat2m-stamp yat2m-lock' 1 2 13 15; \
+               if mkdir yat2m-lock 2>/dev/null; then \
+                 rm -f yat2m-stamp; \
+                 $(MAKE) $(AM_MAKEFLAGS) yat2m-stamp; \
+                 rmdir yat2m-lock; \
+               else \
+                 while test -d yat2m-lock; do sleep 1; done; \
+                 test -f yat2m-stamp; exit $$?; \
+               fi; \
+             fi
+
+
 %.1 : %.sgml
 if HAVE_DOCBOOK_TO_MAN
 	docbook-to-man $<  >$@

Deleted: branches/STABLE-BRANCH-1-4/doc/gpg.sgml

Deleted: branches/STABLE-BRANCH-1-4/doc/gpg.texi

Deleted: branches/STABLE-BRANCH-1-4/doc/gpgv.sgml

Deleted: branches/STABLE-BRANCH-1-4/doc/gpgv.texi

Copied: branches/STABLE-BRANCH-1-4/doc/yat2m.c (from rev 4363, trunk/doc/yat2m.c)