[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (3afdb7efdaf6cc8094cc6143269e7df519183197)
The branch, master has been updated
via 3afdb7efdaf6cc8094cc6143269e7df519183197 (commit)
via bcad6aca51462aa9217d3c215fbe8f20e3d9a204 (commit)
from 750a1c57d85dbb82d704f9443055a783b5dca8eb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
configure.ac | 10 +---------
doc/Makefile.am | 48 +++---------------------------------------------
doc/gs/Makefile.inc | 32 ++++----------------------------
3 files changed, 8 insertions(+), 82 deletions(-)
=================
Commit Messages
=================
commit 3afdb7efdaf6cc8094cc6143269e7df519183197
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
doc: use pdflatex instead of latex
:100644 100644 94c6779... 6736466... M configure.ac
:100755 100755 d4955b2... 95d1ad3... M doc/Makefile.am
:100644 100644 5b5a013... 96e42bd... M doc/gs/Makefile.inc
commit bcad6aca51462aa9217d3c215fbe8f20e3d9a204
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
doc: skip generation of GIF images
:100755 100755 0432a5b... d4955b2... M doc/Makefile.am
:100644 100644 8817a7c... 5b5a013... M doc/gs/Makefile.inc
=========
Changes
=========
commit 3afdb7efdaf6cc8094cc6143269e7df519183197
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
doc: use pdflatex instead of latex
diff --git a/configure.ac b/configure.ac
index 94c6779..6736466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -589,15 +589,9 @@ GNUM4=$M4
AC_SUBST(GNUM4)
AC_DEFINE_UNQUOTED(GNUM4,"$M4",[m4 program used by pcb])
-AC_PATH_PROG(LATEX, latex, notfound)
-AM_CONDITIONAL(MISSING_LATEX, test x$LATEX = xnotfound)
-
AC_PATH_PROG(PDFLATEX, pdflatex, notfound)
AM_CONDITIONAL(MISSING_PDFLATEX, test x$PDFLATEX = xnotfound)
-AC_PATH_PROG(DVIPS, dvips, notfound)
-AM_CONDITIONAL(MISSING_DVIPS, test x$DVIPS = xnotfound)
-
AC_PATH_PROG(TEXI2DVI, texi2dvi, notfound)
AM_CONDITIONAL(MISSING_TEXI2DVI, test x$TEXI2DVI = xnotfound)
@@ -609,13 +603,11 @@ AC_PATH_PROG(GSCHEM, gschem, notfound)
AM_CONDITIONAL(MISSING_GSCHEM, test x$GSCHEM = xnotfound)
if test "X$docs_yesno" = "Xyes" -a "X$pcb_git_version" = "Xyes" ; then
- if test "$LATEX" = "notfound" -o "$PDFLATEX" = "notfound" -o "$DVIPS" = "notfound" -o "$TEXI2DVI" = "notfound" -o "$PS2PDF" = "notfound" ; then
+ if test "$PDFLATEX" = "notfound" -o "$TEXI2DVI" = "notfound" -o "$PS2PDF" = "notfound" ; then
AC_MSG_ERROR([It appears that you are building from a source tree obtained
via git but you do not have the required tools installed to build the documentation. Here
is a list of tools and the detected values:
-LATEX: $LATEX
PDFLATEX: $PDFLATEX
-DVIPS: $DVIPS
TEXI2DVI: $TEXI2DVI
PS2PDF: $PS2PDF
GSCHEM: $GSCHEM
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d4955b2..95d1ad3 100755
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -42,25 +42,13 @@ pcb_TEXINFOS=
endif
dist_html_DATA= ${html_docs} ${pcb_output_inst} ${images_output_inst}
-dist_ps_DATA= ${ps_docs}
dist_pdf_DATA= ${pdf_docs}
dist_man_MANS= pcb.1
html_docs= ${info_TEXINFOS:.texi=.html}
-ps_docs= ${info_TEXINFOS:.texi=.ps} refcard.ps
pdf_docs= ${info_TEXINFOS:.texi=.pdf} refcard.pdf
-# these dependencies prevent a parallel make job
-# from trying to invoke latex and pdflatex at the same
-# time on the same input file. That causes clashes in
-# the .aux files which are used by both latex and
-# pdflatex.
-if GIT_OR_CVS_VERSION
-refcard.pdf: refcard.ps
-pcb.pdf: pcb.ps
-endif
-
# put the html manual into 1 file instead of multiple files?
AM_MAKEINFOHTMLFLAGS= --css-include=$(srcdir)/pcb.css --no-split
@@ -88,8 +76,8 @@ EXTRA_DIST= \
if GIT_OR_CVS_VERSION
BUILT_SOURCES= ${tab_texi} ${pcb_output} ${inline_texi}
CLEANFILES= \
- refcard.aux refcard.dvi refcard.log refcard.pdf refcard.ps \
- ${pcb_output} ${tab_texi} ${inline_texi} pcb.dvi pcb.html pcb.pdf pcb.ps \
+ refcard.aux refcard.dvi refcard.log refcard.pdf \
+ ${pcb_output} ${tab_texi} ${inline_texi} pcb.dvi pcb.html pcb.pdf \
${images_output}
else
BUILT_SOURCES=
@@ -117,7 +105,6 @@ pcb_files= \
gcode.pcb
pcb_output_noinst= \
- ${pcb_files:.pcb=.eps} \
${pcb_files:.pcb=.pdf}
pcb_output_inst= \
@@ -150,7 +137,7 @@ else
@echo "Skipping documentation extraction since you are not building from GIT sources"
endif
-SUFFIXES = .dvi .eps .pcb .pdf .png .ps .tab .tex
+SUFFIXES = .dvi .eps .pcb .pdf .png .tab .tex
.pcb.eps :
${PCB} -x eps --only-visible --font-path $(top_srcdir)/src --eps-file $@ $<
@@ -171,28 +158,6 @@ endif
.tab.texi:
${ASCII2TEXI} $< > $@
-.tex.dvi:
-if MISSING_LATEX
- @echo "****************************************************"
- @echo "WARNING: LaTeX is missing on your system but"
- @echo "$@ is out of date and needs to rebuilt."
- @echo "Changes to $< will be ignored"
-else
- ${LATEX} $<
- ${LATEX} $<
- ${LATEX} $<
-endif
-
-.dvi.ps:
-if MISSING_DVIPS
- @echo "****************************************************"
- @echo "WARNING: dvips is missing on your system but"
- @echo "$@ is out of date and needs to rebuilt."
- @echo "Changes to $< will be ignored"
-else
- ${DVIPS} -Ppdf -j0 -D 300 -o $@ $<
-endif
-
.tex.pdf:
if MISSING_PDFLATEX
@echo "****************************************************"
diff --git a/doc/gs/Makefile.inc b/doc/gs/Makefile.inc
index 5b5a013..96e42bd 100644
--- a/doc/gs/Makefile.inc
+++ b/doc/gs/Makefile.inc
@@ -38,10 +38,9 @@ info_TEXINFOS= ${BASE}.texi
# which can have all sorts of issues.
-dist_pkgdata_DATA= ${html_docs} ${ps_docs} ${pdf_docs} ${pcb_output}
+dist_pkgdata_DATA= ${html_docs} ${pdf_docs} ${pcb_output}
html_docs= ${info_TEXINFOS:.texi=.html}
-ps_docs= ${info_TEXINFOS:.texi=.ps}
pdf_docs= ${info_TEXINFOS:.texi=.pdf}
dvi_docs= ${info_TEXINFOS:.texi=.dvi}
@@ -93,7 +92,6 @@ EXTRA_DIST= \
CLEANFILES = \
${html_docs} \
- ${ps_docs} \
${pdf_docs} \
${eps_files} \
${png_files} \
@@ -103,8 +101,8 @@ CLEANFILES = \
if GIT_VERSION
BUILT_SOURCES= ${tab_texi} ${pcb_output} ${inline_texi}
CLEANFILES+= \
- refcard.aux refcard.dvi refcard.log refcard.pdf refcard.ps \
- ${pcb_output} ${tab_texi} ${inline_texi} pcb.dvi pcb.html pcb.pdf pcb.ps
+ refcard.aux refcard.dvi refcard.log refcard.pdf \
+ ${pcb_output} ${tab_texi} ${inline_texi} pcb.dvi pcb.html pcb.pdf
else
BUILT_SOURCES=
@@ -117,7 +115,7 @@ pcb_output= \
${pcb_files:.pcb=.pdf} \
${pcb_files:.pcb=.png}
-SUFFIXES = .dvi .eps .pcb .pdf .png .ps .tab .tex
+SUFFIXES = .dvi .eps .pcb .pdf .png .tab .tex
%.png %.eps : %.pcb
$(PCB) -x eps --font-path $(top_srcdir)/src --eps-file $*.eps $<
@@ -162,28 +160,6 @@ endif
.tab.texi:
${ASCII2TEXI} $< > $@
-.tex.dvi:
-if MISSING_LATEX
- @echo "****************************************************"
- @echo "WARNING: LaTeX is missing on your system but"
- @echo "$@ is out of date and needs to rebuilt."
- @echo "Changes to $< will be ignored"
-else
- ${LATEX} $<
- ${LATEX} $<
- ${LATEX} $<
-endif
-
-.dvi.ps:
-if MISSING_DVIPS
- @echo "****************************************************"
- @echo "WARNING: dvips is missing on your system but"
- @echo "$@ is out of date and needs to rebuilt."
- @echo "Changes to $< will be ignored"
-else
- ${DVIPS} -Ppdf -j0 -D 300 -o $@ $<
-endif
-
.tex.pdf:
if MISSING_PDFLATEX
@echo "****************************************************"
commit bcad6aca51462aa9217d3c215fbe8f20e3d9a204
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
doc: skip generation of GIF images
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0432a5b..d4955b2 100755
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -121,7 +121,6 @@ pcb_output_noinst= \
${pcb_files:.pcb=.pdf}
pcb_output_inst= \
- ${pcb_files:.pcb=.gif} \
${pcb_files:.pcb=.png}
pcb_output= ${pcb_output_inst} ${pcb_output_noinst}
@@ -151,14 +150,11 @@ else
@echo "Skipping documentation extraction since you are not building from GIT sources"
endif
-SUFFIXES = .dvi .eps .gif .pcb .pdf .png .ps .tab .tex
+SUFFIXES = .dvi .eps .pcb .pdf .png .ps .tab .tex
.pcb.eps :
${PCB} -x eps --only-visible --font-path $(top_srcdir)/src --eps-file $@ $<
-.pcb.gif :
- ${PCB} -x png --only-visible --format GIF --font-path $(top_srcdir)/src --outfile $@ $<
-
.pcb.png :
${PCB} -x png --only-visible --font-path $(top_srcdir)/src --outfile $@ $<
@@ -211,6 +207,3 @@ endif
.eps.png:
${PERL} eps2png --png $< > $@
-
-.eps.gif:
- ${PERL} eps2png --gif $< > $@
diff --git a/doc/gs/Makefile.inc b/doc/gs/Makefile.inc
index 8817a7c..5b5a013 100644
--- a/doc/gs/Makefile.inc
+++ b/doc/gs/Makefile.inc
@@ -117,7 +117,7 @@ pcb_output= \
${pcb_files:.pcb=.pdf} \
${pcb_files:.pcb=.png}
-SUFFIXES = .dvi .eps .gif .pcb .pdf .png .ps .tab .tex
+SUFFIXES = .dvi .eps .pcb .pdf .png .ps .tab .tex
%.png %.eps : %.pcb
$(PCB) -x eps --font-path $(top_srcdir)/src --eps-file $*.eps $<
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs