Imported Upstream version 1.0.25upstream/1.0.25

1 files changed, 14 insertions, 9 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 20b8ffb..ef83201 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -253,6 +253,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_LIBS = @PNG_LIBS@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -264,11 +265,14 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
 SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
+SNMP_LIBS = @SNMP_LIBS@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
 SYSLOG_LIBS = @SYSLOG_LIBS@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
 USB_LIBS = @USB_LIBS@
@@ -336,13 +340,13 @@ man1_MANS = scanimage.1 sane-config.1 sane-find-scanner.1 gamma4scanimage.1
 EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	gamma4scanimage.man sane-abaton.man sane-agfafocus.man \
 	sane-apple.man sane-as6e.man sane-dll.man sane-dc25.man \
-	sane-dmc.man sane-epson.man sane-epson2.man sane-hp.man \
-	sane-gphoto2.man sane-leo.man sane-lexmark.man \
+	sane-dmc.man sane-epson.man sane-epson2.man sane-epsonds.man \
+	sane-hp.man sane-gphoto2.man sane-leo.man sane-lexmark.man \
 	sane-matsushita.man sane-microtek.man sane-microtek2.man \
 	sane-mustek.man sane-nec.man sane-net.man sane-pie.man \
-	sane-pint.man sane-pnm.man sane-umax.man sane-qcam.man \
-	sane-scsi.man sane-artec.man sane-fujitsu.man sane-sharp.man \
-	sane-s9036.man sane-tamarack.man sane-kodak.man \
+	sane-pieusb.man sane-pint.man sane-pnm.man sane-umax.man \
+	sane-qcam.man sane-scsi.man sane-artec.man sane-fujitsu.man \
+	sane-sharp.man sane-s9036.man sane-tamarack.man sane-kodak.man \
 	sane-kodakaio.man sane-ricoh.man sane-avision.man \
 	sane-plustek.man sane-st400.man sane-mustek_pp.man \
 	sane-dc210.man sane-v4l.man sane-snapscan.man sane-canon.man \
@@ -373,10 +377,10 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	icons/references.gif icons/references_gr.gif icons/up.gif \
 	icons/up_gr.gif
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
-	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 \
+	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 sane-epsonds.5 \
 	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
 	sane-matsushita.5 sane-microtek.5 sane-microtek2.5 sane-mustek.5 \
-	sane-nec.5 sane-net.5 sane-pie.5 sane-pint.5 sane-pnm.5 \
+	sane-nec.5 sane-net.5 sane-pie.5 sane-pieusb.5 sane-pint.5 sane-pnm.5 \
 	sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 sane-kodakaio.5 \
 	sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
 	sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
@@ -452,6 +456,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.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/epsonds.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 \
@@ -465,7 +470,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.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/niash.desc descriptions/pie.desc descriptions/pieusb.desc descriptions/pint.desc \
   descriptions/p5.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 \