* doc/Makefile.am: Get rid of unneeded gnu extensions to quieten

down autotools warnings.
merge-requests/1/head
Chris Bagwell 2009-02-22 02:05:05 +00:00
rodzic be3f46204b
commit 7d06da3be7
3 zmienionych plików z 73 dodań i 79 usunięć

Wyświetl plik

@ -1,6 +1,8 @@
2009-02-21 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* po/Makefile.am, configure.in: convert remaining directory,
po, to use automake.
* doc/Makefile.am: Get rid of unneeded gnu extensions to quieten
down autotools warnings.
2009-03-20 m. allan noah <kitno455 a t gmail d o t com>
* backend/avision.c: backend v290, fix reader_pid and NVRAM option

Wyświetl plik

@ -155,7 +155,7 @@ BEDOCS += umax/negative-types.txt umax/sane-logo.jpg \
EXTRA_DIST += sane.tex net.tex html.sty
EXTRA_DIST += descriptions/abaton.desc descriptions/agfafocus.desc \
DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
descriptions/apple.desc descriptions/artec.desc \
descriptions/artec_eplus48u.desc descriptions/as6e.desc \
descriptions/avision.desc descriptions/bh.desc descriptions/canon630u.desc \
@ -187,8 +187,9 @@ EXTRA_DIST += descriptions/abaton.desc descriptions/agfafocus.desc \
descriptions/umax1220u.desc descriptions/umax.desc \
descriptions/umax_pp.desc descriptions/unsupported.desc \
descriptions/v4l.desc descriptions/xerox_mfp.desc
EXTRA_DIST += $(DESC_FILES)
EXTRA_DIST += descriptions-external/brother2.desc \
DESC_EXT_FILES = descriptions-external/brother2.desc \
descriptions-external/brother.desc \
descriptions-external/brother-mfc4600.desc \
descriptions-external/canon_mfp.desc \
@ -208,6 +209,7 @@ EXTRA_DIST += descriptions-external/brother2.desc \
descriptions-external/template.desc. \
descriptions-external/v4l2.desc \
descriptions-external/viceo.desc
EXTRA_DIST += $(DESC_EXT_FILES)
EXTRA_DIST += figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
@ -250,14 +252,13 @@ html-man: $(MANPAGES)
../tools/sane-desc:
cd ../tools ; $(MAKE) sane-desc
sane-backends.html: $(wildcard descriptions/*.desc) ../tools/sane-desc
sane-backends.html: $(DESC_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-backends-split -s ${srcdir}/descriptions \
-i "The following table summarizes the backends/drivers distributed \
with $(PACKAGE)-$(VERSION), and the hardware or software they \
support." -d 0 > sane-backends.html
sane-backends-external.html: $(wildcard descriptions-external/*.desc) \
../tools/sane-desc
sane-backends-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-backends-split \
-s ${srcdir}/descriptions-external \
-i "The following table summarizes the backends/drivers that \
@ -266,14 +267,13 @@ sane-backends-external.html: $(wildcard descriptions-external/*.desc) \
-t "SANE: External Backends (Drivers)" -d 0 \
> sane-backends-external.html
sane-mfgs.html: $(wildcard descriptions/*.desc) ../tools/sane-desc
sane-mfgs.html: $(DESC_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions \
-i "The following table summarizes the devices supported \
by $(PACKAGE)-$(VERSION)." \
-d 0 > sane-mfgs.html
sane-mfgs-external.html: $(wildcard descriptions-external/*.desc) \
../tools/sane-desc
sane-mfgs-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions-external \
-i "The following table summarizes the devices that \
are supported by external backends." \

Wyświetl plik

@ -264,71 +264,11 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
sane-epjitsu.man sane-hs2p.man sane-canon_dr.man \
sane-xerox_mfp.man sane-rts8891.man sane.man saned.man \
descriptions.txt releases.txt sane-logo2.jpg sane-logo.png \
sane.png sane.tex net.tex html.sty descriptions/abaton.desc \
descriptions/agfafocus.desc descriptions/apple.desc \
descriptions/artec.desc descriptions/artec_eplus48u.desc \
descriptions/as6e.desc descriptions/avision.desc \
descriptions/bh.desc descriptions/canon630u.desc \
descriptions/canon.desc descriptions/canon_dr.desc \
descriptions/canon_pp.desc descriptions/cardscan.desc \
descriptions/coolscan2.desc descriptions/coolscan.desc \
descriptions/dc210.desc descriptions/dc240.desc \
descriptions/dc25.desc descriptions/dell1600n_net.desc \
descriptions/dll.desc descriptions/dmc.desc \
descriptions/epjitsu.desc descriptions/epson2.desc \
descriptions/epson.desc descriptions/fujitsu.desc \
descriptions/genesys.desc descriptions/gphoto2.desc \
descriptions/gt68xx.desc descriptions/hp3500.desc \
descriptions/hp3900.desc descriptions/hp4200.desc \
descriptions/hp5400.desc descriptions/hp5590.desc \
descriptions/hp.desc descriptions/hpljm1005.desc \
descriptions/hpsj5s.desc descriptions/hs2p.desc \
descriptions/ibm.desc descriptions/leo.desc \
descriptions/lexmark.desc descriptions/ma1509.desc \
descriptions/matsushita.desc descriptions/microtek2.desc \
descriptions/microtek.desc descriptions/mustek.desc \
descriptions/mustek_pp.desc descriptions/mustek_usb2.desc \
descriptions/mustek_usb.desc descriptions/nec.desc \
descriptions/net.desc descriptions/niash.desc \
descriptions/pie.desc descriptions/pint.desc \
descriptions/pixma.desc descriptions/plustek.desc \
descriptions/plustek_pp.desc descriptions/pnm.desc \
descriptions/qcam.desc descriptions/ricoh.desc \
descriptions/rts8891.desc descriptions/s9036.desc \
descriptions/sceptre.desc descriptions/sharp.desc \
descriptions/sm3600.desc descriptions/sm3840.desc \
descriptions/snapscan.desc descriptions/sp15c.desc \
descriptions/st400.desc descriptions/stv680.desc \
descriptions/tamarack.desc descriptions/teco1.desc \
descriptions/teco2.desc descriptions/teco3.desc \
descriptions/template.desc. descriptions/test.desc \
descriptions/u12.desc descriptions/umax1220u.desc \
descriptions/umax.desc descriptions/umax_pp.desc \
descriptions/unsupported.desc descriptions/v4l.desc \
descriptions/xerox_mfp.desc \
descriptions-external/brother2.desc \
descriptions-external/brother.desc \
descriptions-external/brother-mfc4600.desc \
descriptions-external/canon_mfp.desc \
descriptions-external/cs3200f.desc \
descriptions-external/epkowa.desc \
descriptions-external/geniusvp2.desc \
descriptions-external/hp3770.desc \
descriptions-external/hp8200.desc \
descriptions-external/hpaio.desc \
descriptions-external/hpoj.desc \
descriptions-external/lhii.desc \
descriptions-external/mustek_a3p1.desc \
descriptions-external/primascan.desc \
descriptions-external/primax.desc \
descriptions-external/samsung.desc \
descriptions-external/scanwit.desc \
descriptions-external/template.desc. \
descriptions-external/v4l2.desc \
descriptions-external/viceo.desc figs/area.eps figs/area.fig \
figs/flow.eps figs/flow.fig figs/hierarchy.eps \
figs/hierarchy.fig figs/image-data.eps figs/image-data.fig \
figs/xfer.eps figs/xfer.fig icons/contents.gif icons/index.gif \
sane.png sane.tex net.tex html.sty $(DESC_FILES) \
$(DESC_EXT_FILES) figs/area.eps figs/area.fig figs/flow.eps \
figs/flow.fig figs/hierarchy.eps figs/hierarchy.fig \
figs/image-data.eps figs/image-data.fig figs/xfer.eps \
figs/xfer.fig icons/contents.gif icons/index.gif \
icons/next.gif icons/next_gr.gif icons/previous.gif \
icons/previous_gr.gif icons/references.gif \
icons/references_gr.gif icons/up.gif icons/up_gr.gif
@ -400,6 +340,60 @@ BEDOCS = canon/canon.changes canon/canon.install2700F.txt \
umax/sane-umax-uc-doc.html umax/sane-umax-vista-doc.html \
umax/sane-umax.jpg umax/umax.BUGS umax/umax.CHANGES \
umax/umax.FAQ umax/umax.TODO
DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
descriptions/apple.desc descriptions/artec.desc \
descriptions/artec_eplus48u.desc descriptions/as6e.desc \
descriptions/avision.desc descriptions/bh.desc descriptions/canon630u.desc \
descriptions/canon.desc descriptions/canon_dr.desc \
descriptions/canon_pp.desc descriptions/cardscan.desc \
descriptions/coolscan2.desc descriptions/coolscan.desc \
descriptions/dc210.desc descriptions/dc240.desc descriptions/dc25.desc \
descriptions/dell1600n_net.desc descriptions/dll.desc descriptions/dmc.desc \
descriptions/epjitsu.desc descriptions/epson2.desc descriptions/epson.desc \
descriptions/fujitsu.desc descriptions/genesys.desc \
descriptions/gphoto2.desc descriptions/gt68xx.desc descriptions/hp3500.desc \
descriptions/hp3900.desc descriptions/hp4200.desc descriptions/hp5400.desc \
descriptions/hp5590.desc descriptions/hp.desc descriptions/hpljm1005.desc \
descriptions/hpsj5s.desc descriptions/hs2p.desc descriptions/ibm.desc \
descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \
descriptions/matsushita.desc descriptions/microtek2.desc \
descriptions/microtek.desc descriptions/mustek.desc \
descriptions/mustek_pp.desc descriptions/mustek_usb2.desc \
descriptions/mustek_usb.desc descriptions/nec.desc descriptions/net.desc \
descriptions/niash.desc descriptions/pie.desc descriptions/pint.desc \
descriptions/pixma.desc descriptions/plustek.desc \
descriptions/plustek_pp.desc descriptions/pnm.desc descriptions/qcam.desc \
descriptions/ricoh.desc descriptions/rts8891.desc descriptions/s9036.desc \
descriptions/sceptre.desc descriptions/sharp.desc descriptions/sm3600.desc \
descriptions/sm3840.desc descriptions/snapscan.desc descriptions/sp15c.desc \
descriptions/st400.desc descriptions/stv680.desc descriptions/tamarack.desc \
descriptions/teco1.desc descriptions/teco2.desc descriptions/teco3.desc \
descriptions/template.desc. descriptions/test.desc descriptions/u12.desc \
descriptions/umax1220u.desc descriptions/umax.desc \
descriptions/umax_pp.desc descriptions/unsupported.desc \
descriptions/v4l.desc descriptions/xerox_mfp.desc
DESC_EXT_FILES = descriptions-external/brother2.desc \
descriptions-external/brother.desc \
descriptions-external/brother-mfc4600.desc \
descriptions-external/canon_mfp.desc \
descriptions-external/cs3200f.desc \
descriptions-external/epkowa.desc \
descriptions-external/geniusvp2.desc \
descriptions-external/hp3770.desc \
descriptions-external/hp8200.desc \
descriptions-external/hpaio.desc \
descriptions-external/hpoj.desc \
descriptions-external/lhii.desc \
descriptions-external/mustek_a3p1.desc \
descriptions-external/primascan.desc \
descriptions-external/primax.desc \
descriptions-external/samsung.desc \
descriptions-external/scanwit.desc \
descriptions-external/template.desc. \
descriptions-external/v4l2.desc \
descriptions-external/viceo.desc
all: all-am
.SUFFIXES:
@ -823,14 +817,13 @@ html-man: $(MANPAGES)
../tools/sane-desc:
cd ../tools ; $(MAKE) sane-desc
sane-backends.html: $(wildcard descriptions/*.desc) ../tools/sane-desc
sane-backends.html: $(DESC_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-backends-split -s ${srcdir}/descriptions \
-i "The following table summarizes the backends/drivers distributed \
with $(PACKAGE)-$(VERSION), and the hardware or software they \
support." -d 0 > sane-backends.html
sane-backends-external.html: $(wildcard descriptions-external/*.desc) \
../tools/sane-desc
sane-backends-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-backends-split \
-s ${srcdir}/descriptions-external \
-i "The following table summarizes the backends/drivers that \
@ -839,14 +832,13 @@ sane-backends-external.html: $(wildcard descriptions-external/*.desc) \
-t "SANE: External Backends (Drivers)" -d 0 \
> sane-backends-external.html
sane-mfgs.html: $(wildcard descriptions/*.desc) ../tools/sane-desc
sane-mfgs.html: $(DESC_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions \
-i "The following table summarizes the devices supported \
by $(PACKAGE)-$(VERSION)." \
-d 0 > sane-mfgs.html
sane-mfgs-external.html: $(wildcard descriptions-external/*.desc) \
../tools/sane-desc
sane-mfgs-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions-external \
-i "The following table summarizes the devices that \
are supported by external backends." \