From 9a39356390e7478a5ac749e96fa016d82de5016a Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Sun, 20 May 2001 06:43:07 +0000
Subject: [PATCH] * doc-gnome/C/Makefile.am: Distribute mkhtml and
 genindex.sgml. Create figs/*.eps if needed. Simplify rules for gmc.dvi and
 gmc.rtf - DocBook 4.1 doesn't try to write to $(srcdir). *
 doc-gnome/C/figs/Makefile.am: Add support for converting from PNG to EPS.

---
 ChangeLog                    |  6 ++++++
 doc-gnome/C/Makefile.am      | 24 ++++--------------------
 doc-gnome/C/figs/Makefile.am | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d0c0f3bf4..7e11314c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-05-20  Pavel Roskin  <proski@gnu.org>
 
+	* doc-gnome/C/Makefile.am: Distribute mkhtml and genindex.sgml.
+	Create figs/*.eps if needed. Simplify rules for gmc.dvi and
+	gmc.rtf - DocBook 4.1 doesn't try to write to $(srcdir).
+	* doc-gnome/C/figs/Makefile.am: Add support for converting from
+	PNG to EPS.
+
 	* Makefile.am (EXTRA_DIST): Remove create_vcs.
 	* doc/FILES: Likewise. Typo fix.
 
diff --git a/doc-gnome/C/Makefile.am b/doc-gnome/C/Makefile.am
index 9e0e8ca01..dc07dca63 100644
--- a/doc-gnome/C/Makefile.am
+++ b/doc-gnome/C/Makefile.am
@@ -8,7 +8,7 @@ noinst_SCRIPTS = mkhtml
 
 SGML_FILES = gmc.sgml
 
-EXTRA_DIST = topic.dat $(SGML_FILES)
+EXTRA_DIST = topic.dat genindex.sgml $(SGML_FILES) $(noinst_SCRIPTS)
 
 MOSTLYCLEANFILES = *.tex *.log *.aux
 CLEANFILES = gmc.dvi gmc.ps gmc.pdf gmc.rtf
@@ -32,29 +32,13 @@ dvi-local: gmc.dvi
 
 # "make distcheck" (automake-1.4a) requires that *.dvi are created in
 # the build directory, since the source directory is read-only.
-# However, db2dvi (docbook-3.1) doesn't allow redirecting the output.
-# So let's copy gmc.sgml to a temp directory. Now *.dvi goes to ".",
-# but *.rtf remains in "tmp", so let's try to copy it from "tmp" -
-# maybe future versions of docbook will be more consistent.
 gmc.dvi: $(srcdir)/gmc.sgml
-	mkdir tmpdvi
-	cp -f $(srcdir)/gmc.sgml tmpdvi
-	db2dvi tmpdvi/gmc.sgml
-	if test -f tmpdvi/gmc.dvi; then \
-	  mv -f tmpdvi/gmc.dvi gmc.dvi; \
-	else :; fi
-	rm -rf tmpdvi
+	(cd figs && $(MAKE) eps)
+	db2dvi $(srcdir)/gmc.sgml
 
 gmc.rtf: $(srcdir)/gmc.sgml
-	mkdir tmprtf
-	cp -f $(srcdir)/gmc.sgml tmprtf
-	db2rtf tmprtf/gmc.sgml
-	if test -f tmprtf/gmc.rtf; then \
-	  mv -f tmprtf/gmc.rtf gmc.rtf; \
-	else :; fi
-	rm -rf tmprtf
+	db2rtf $(srcdir)/gmc.sgml
 
-# FIXME: for gmc.ps and gmc.pdf we also need to convert *.png to *.eps
 gmc.ps: gmc.dvi
 	dvips gmc.dvi -o gmc.ps
 
diff --git a/doc-gnome/C/figs/Makefile.am b/doc-gnome/C/figs/Makefile.am
index a7a8da6c3..b7e660000 100644
--- a/doc-gnome/C/figs/Makefile.am
+++ b/doc-gnome/C/figs/Makefile.am
@@ -17,3 +17,18 @@ DISTFIGS = \
 	rubberband.png
 
 EXTRA_DIST = $(DISTFIGS)
+
+CLEANFILES = *.eps
+
+SUFFIXES = .png .eps
+
+CONVERT = convert
+CONVERT_FLAGS = -geometry 50%x50%
+
+.png.eps:
+	$(CONVERT) $(CONVERT_FLAGS) $< $@
+
+eps:
+	for fig in $(DISTFIGS); do \
+	  $(MAKE) `echo $$fig | sed 's/\.png$$/.eps/'` || exit 1; \
+	done