applied some of meeks's patches

Original commit message from CVS:
applied some of meeks's patches
This commit is contained in:
Thomas Vander Stichele 2002-03-02 10:33:40 +00:00
parent 8bb166dace
commit 8a14dad222
5 changed files with 23 additions and 15 deletions

View file

@ -1,3 +1,11 @@
2002-03-01 Michael Meeks <michael@ximian.com>
* docs/manual/Makefile.am: use $(wildcard) instead of
strange shell stuff.
* tools/Makefile.am: handle conditionals in a compatible way
* docs/manuals.mak: don't do silly things with if/else
2002-01-15 Bastien Nocera <hadess@hadess.net>
* tests/Makefile.am: add all the dirs to the DIST_SUBDIRS

View file

@ -1,13 +1,13 @@
DOC=gst-plugin-writers-guide
MAIN=$(DOC).xml
XML=$(shell cd $(srcdir) && echo *.xml)
XML=$(wildcard *.xml)
XSLFO=$(srcdir)/../xsl/fo.xsl
XSLFOMODS=$(srcdir)/../xsl/ulink.xsl $(srcdir)/../xsl/keycombo.xsl
XSLHTML=$(srcdir)/../xsl/html.xsl
XSLHTMLMODS=$(srcdir)/../xsl/fileext.xsl $(srcdir)/../xsl/admon.xsl \
$(srcdir)/../xsl/keycombo.xsl $(srcdir)/../xsl/css.xsl
XSLS=$(XSLFO) $(XSLFOMODS) $(XSLHTML) $(XSLHTMLMODS)
FIGS= # $(shell cd $(srcdir) && echo *.fig) (uncomment when pngs are added)
FIGS= # $(wildcard *.fig) (uncomment when pngs are added)
PNGS=$(FIGS:.fig=.png)
PDFS=$(FIGS:.fig=.pdf)
SRC=$(XML)

View file

@ -1,13 +1,13 @@
DOC=gstreamer-manual
MAIN=$(DOC).xml
XML=$(shell cd $(srcdir) && echo *.xml)
XML=$(wildcard *.xml)
XSLFO=$(srcdir)/../xsl/fo.xsl
XSLFOMODS=$(srcdir)/../xsl/ulink.xsl $(srcdir)/../xsl/keycombo.xsl
XSLHTML=$(srcdir)/../xsl/html.xsl
XSLHTMLMODS=$(srcdir)/../xsl/fileext.xsl $(srcdir)/../xsl/admon.xsl \
$(srcdir)/../xsl/keycombo.xsl $(srcdir)/../xsl/css.xsl
XSLS=$(XSLFO) $(XSLFOMODS) $(XSLHTML) $(XSLHTMLMODS)
FIGS=$(shell cd $(srcdir) && echo *.fig)
FIGS=$(wildcard *.fig)
PNGS=$(FIGS:.fig=.png)
PDFS=$(FIGS:.fig=.pdf)
SRC=$(XML)

View file

@ -9,9 +9,9 @@ if HAVE_XSLTPROC
if HAVE_FIG2DEV_PNG
html: $(DOC)
else !HAVE_FIG2DEV_PNG
else #!HAVE_FIG2DEV_PNG
html:
endif !HAVE_FIG2DEV_PNG
endif #!HAVE_FIG2DEV_PNG
if HAVE_FIG2DEV_PDF
if HAVE_PDFXMLTEX
@ -19,25 +19,25 @@ pdf: $(DOC).pdf
if HAVE_PDFTOPS
ps: $(DOC).ps
else !HAVE_PDFTOPS
else #!HAVE_PDFTOPS
ps:
endif !HAVE_PDFTOPS
endif #!HAVE_PDFTOPS
else !HAVE_PDFXMLTEX
else #!HAVE_PDFXMLTEX
pdf:
ps:
endif !HAVE_PDFXMLTEX
endif #!HAVE_PDFXMLTEX
else !HAVE_FIG2DEV_PDF
else #!HAVE_FIG2DEV_PDF
pdf:
ps:
endif !HAVE_FIG2DEV_PDF
endif #!HAVE_FIG2DEV_PDF
else !HAVE_XSLTPROC
else #!HAVE_XSLTPROC
html:
ps:
pdf:
endif !HAVE_XSLTPROC
endif #!HAVE_XSLTPROC
$(DOC).fo: $(XML) $(PDFS) $(XSLFO) $(XSLFOMODS)
cp magic-pdf magic

View file

@ -1,3 +1,3 @@
XSL=$(shell cd $(srcdir) && echo *.xsl)
XSL=$(wildcard *.xsl)
EXTRA_DIST = $(XSL)