[PATCH] Remove pdf target from Makefiles

[PATCH] Remove pdf target from Makefiles

[Thomas Ackermann]

This target was only used to create user-manual.pdf with dblatex
using a separate style definition than was used for user-manual.html.
These two style definitions had to be maintained separately and
so made improvements to user-manual.html unnecessarily hard.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---

Improving anything on the formatting of user-manual.pdf would necessitate
to create customized versions of public dblatex style files from
/etc/asciidoc/dblatex/. Instead of trying to expand on creating more and better
pdfs from the git documentation I suggest to drop the pdf target altogether
and thus also get rid of the dependency on dblatex.

 Documentation/Makefile | 15 ---------------
 Makefile               |  6 ------
 2 files changed, 21 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 62dbd9a..c42aa07 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -81,7 +81,6 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 prefix?=$(HOME)
 bindir?=$(prefix)/bin
 htmldir?=$(prefix)/share/doc/git-doc
-pdfdir?=$(prefix)/share/doc/git-doc
 mandir?=$(prefix)/share/man
 man1dir=$(mandir)/man1
 man5dir=$(mandir)/man5
@@ -102,7 +101,6 @@ infodir?=$(prefix)/share/info
 MAKEINFO=makeinfo
 INSTALL_INFO=install-info
 DOCBOOK2X_TEXI=docbook2x-texi
-DBLATEX=dblatex
 ifndef PERL_PATH
 	PERL_PATH = /usr/bin/perl
 endif
@@ -185,7 +183,6 @@ ifndef V
 	QUIET_XMLTO	= @echo '   ' XMLTO $@;
 	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;
 	QUIET_MAKEINFO	= @echo '   ' MAKEINFO $@;
-	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
 	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_GEN	= @echo '   ' GEN $@;
 	QUIET_STDERR	= 2> /dev/null
@@ -207,8 +204,6 @@ man7: $(DOC_MAN7)
 
 info: git.info gitman.info
 
-pdf: user-manual.pdf
-
 install: install-man
 
 install-man: man
@@ -229,10 +224,6 @@ install-info: info
 	  echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
 	fi
 
-install-pdf: pdf
-	$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir)
-	$(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir)
-
 install-html: html
 	'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
 
@@ -289,7 +280,6 @@ mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
 clean:
 	$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
 	$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
-	$(RM) *.pdf
 	$(RM) howto-index.txt howto/*.html doc.dep
 	$(RM) technical/*.html technical/api-index.txt
 	$(RM) $(cmds_txt) $(mergetools_txt) *.made
@@ -352,11 +342,6 @@ user-manual.texi: user-manual.xml
 	rm $@++ && \
 	mv $@+ $@
 
-user-manual.pdf: user-manual.xml
-	$(QUIET_DBLATEX)$(RM) $@+ $@ && \
-	$(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $< && \
-	mv $@+ $@
-
 gitman.texi: $(MAN_XML) cat-texi.perl
 	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
 	($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
diff --git a/Makefile b/Makefile
index 03524d0..ab8fb15 100644
--- a/Makefile
+++ b/Makefile
@@ -2089,9 +2089,6 @@ html:
 info:
 	$(MAKE) -C Documentation info
 
-pdf:
-	$(MAKE) -C Documentation pdf
-
 XGETTEXT_FLAGS = \
 	--force-po \
 	--add-comments \
@@ -2404,9 +2401,6 @@ install-html:
 install-info:
 	$(MAKE) -C Documentation install-info
 
-install-pdf:
-	$(MAKE) -C Documentation install-pdf
-
 quick-install-doc:
 	$(MAKE) -C Documentation quick-install
 
-- 
1.8.3.msysgit.0



---
Thomas

Re: [PATCH] Remove pdf target from Makefiles

[Jonathan Nieder]

Hi Thomas,

Thomas Ackermann wrote:

> This target was only used to create user-manual.pdf with dblatex
> using a separate style definition than was used for user-manual.html.
> These two style definitions had to be maintained separately and
> so made improvements to user-manual.html unnecessarily hard.

I don't understand.  Do you mean that you want to change the rules
that generate user-manual.xml?  Would generating different XML files
for the PDF and for other purposes (with different names) work as a
way to achieve that without losing the printable manual?

Thanks,
Jonathan