diff --git a/ChangeLog b/ChangeLog index 06c376213..0717162a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-02-12 m. allan noah + * backend/kvs1025*: add new backend from Panasonic Russia, Ltd. + * backend/Makefile.*, configure*, doc/Makefile.*, doc/sane.man: + backend integration changes + * doc/desciptions/kvs1025.desc, doc/sane-kvs1025.man: + the parts Panasonic forgot + 2010-02-12 m. allan noah * backend/fujitsu.c: disable bg_color for S1500 diff --git a/backend/Makefile.am b/backend/Makefile.am index 9ca783658..b1a72823b 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -175,6 +175,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \ libhp3500.la libhp3900.la libhp4200.la \ libhp5400.la libhp5590.la libhpljm1005.la \ libhpsj5s.la libhs2p.la libibm.la libkodak.la \ + libkvs1025.la \ libleo.la liblexmark.la libma1509.la \ libmatsushita.la libmicrotek.la libmicrotek2.la \ libmustek.la libmustek_pp.la libmustek_usb.la \ @@ -206,6 +207,7 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \ libsane-hp3500.la libsane-hp3900.la libsane-hp4200.la \ libsane-hp5400.la libsane-hp5590.la libsane-hpljm1005.la \ libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la \ + libsane-kvs1025.la \ libsane-leo.la libsane-lexmark.la libsane-ma1509.la \ libsane-matsushita.la libsane-microtek.la libsane-microtek2.la \ libsane-mustek.la libsane-mustek_pp.la libsane-mustek_usb.la \ @@ -615,6 +617,15 @@ libsane_kodak_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_kodak_la_LIBADD = $(COMMON_LIBS) libkodak.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) EXTRA_DIST += kodak.conf.in +libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \ + kvs1025.h kvs1025_low.h kvs1025_usb.h kvs1025_cmds.h +libkvs1025_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs1025 + +nodist_libsane_kvs1025_la_SOURCES = kvs1025-s.c +libsane_kvs1025_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs1025 +libsane_kvs1025_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) +libsane_kvs1025_la_LIBADD = $(COMMON_LIBS) libkvs1025.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) + libleo_la_SOURCES = leo.c leo.h libleo_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=leo diff --git a/backend/Makefile.in b/backend/Makefile.in index c58cfe944..1791597ef 100644 --- a/backend/Makefile.in +++ b/backend/Makefile.in @@ -199,6 +199,11 @@ libibm_la_OBJECTS = $(am_libibm_la_OBJECTS) libkodak_la_LIBADD = am_libkodak_la_OBJECTS = libkodak_la-kodak.lo libkodak_la_OBJECTS = $(am_libkodak_la_OBJECTS) +libkvs1025_la_LIBADD = +am_libkvs1025_la_OBJECTS = libkvs1025_la-kvs1025.lo \ + libkvs1025_la-kvs1025_low.lo libkvs1025_la-kvs1025_opt.lo \ + libkvs1025_la-kvs1025_usb.lo +libkvs1025_la_OBJECTS = $(am_libkvs1025_la_OBJECTS) libleo_la_LIBADD = am_libleo_la_OBJECTS = libleo_la-leo.lo libleo_la_OBJECTS = $(am_libleo_la_OBJECTS) @@ -686,6 +691,15 @@ libsane_kodak_la_OBJECTS = $(nodist_libsane_kodak_la_OBJECTS) libsane_kodak_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libsane_kodak_la_LDFLAGS) $(LDFLAGS) -o $@ +libsane_kvs1025_la_DEPENDENCIES = $(COMMON_LIBS) libkvs1025.la \ + ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \ + ../sanei/sanei_config.lo sane_strstatus.lo \ + ../sanei/sanei_usb.lo $(am__DEPENDENCIES_1) +nodist_libsane_kvs1025_la_OBJECTS = libsane_kvs1025_la-kvs1025-s.lo +libsane_kvs1025_la_OBJECTS = $(nodist_libsane_kvs1025_la_OBJECTS) +libsane_kvs1025_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libsane_kvs1025_la_LDFLAGS) $(LDFLAGS) -o $@ libsane_leo_la_DEPENDENCIES = $(COMMON_LIBS) libleo.la \ ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \ ../sanei/sanei_config.lo ../sanei/sanei_config2.lo \ @@ -1213,18 +1227,19 @@ SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \ $(libhp5590_la_SOURCES) $(libhpljm1005_la_SOURCES) \ $(libhpsj5s_la_SOURCES) $(libhs2p_la_SOURCES) \ $(libibm_la_SOURCES) $(libkodak_la_SOURCES) \ - $(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \ - $(libma1509_la_SOURCES) $(libmatsushita_la_SOURCES) \ - $(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \ - $(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \ - $(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \ - $(libnec_la_SOURCES) $(libnet_la_SOURCES) \ - $(libniash_la_SOURCES) $(libpie_la_SOURCES) \ - $(libpint_la_SOURCES) $(libpixma_la_SOURCES) \ - $(libplustek_la_SOURCES) $(libplustek_pp_la_SOURCES) \ - $(libpnm_la_SOURCES) $(libqcam_la_SOURCES) \ - $(libricoh_la_SOURCES) $(librts8891_la_SOURCES) \ - $(libs9036_la_SOURCES) $(nodist_libsane_abaton_la_SOURCES) \ + $(libkvs1025_la_SOURCES) $(libleo_la_SOURCES) \ + $(liblexmark_la_SOURCES) $(libma1509_la_SOURCES) \ + $(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \ + $(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \ + $(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \ + $(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \ + $(libnet_la_SOURCES) $(libniash_la_SOURCES) \ + $(libpie_la_SOURCES) $(libpint_la_SOURCES) \ + $(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \ + $(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \ + $(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \ + $(librts8891_la_SOURCES) $(libs9036_la_SOURCES) \ + $(nodist_libsane_abaton_la_SOURCES) \ $(nodist_libsane_agfafocus_la_SOURCES) \ $(nodist_libsane_apple_la_SOURCES) \ $(nodist_libsane_artec_la_SOURCES) \ @@ -1264,6 +1279,7 @@ SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \ $(nodist_libsane_hs2p_la_SOURCES) \ $(nodist_libsane_ibm_la_SOURCES) \ $(nodist_libsane_kodak_la_SOURCES) \ + $(nodist_libsane_kvs1025_la_SOURCES) \ $(nodist_libsane_leo_la_SOURCES) \ $(nodist_libsane_lexmark_la_SOURCES) \ $(nodist_libsane_ma1509_la_SOURCES) \ @@ -1336,27 +1352,28 @@ DIST_SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \ $(libhp5590_la_SOURCES) $(libhpljm1005_la_SOURCES) \ $(libhpsj5s_la_SOURCES) $(libhs2p_la_SOURCES) \ $(libibm_la_SOURCES) $(libkodak_la_SOURCES) \ - $(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \ - $(libma1509_la_SOURCES) $(libmatsushita_la_SOURCES) \ - $(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \ - $(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \ - $(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \ - $(libnec_la_SOURCES) $(libnet_la_SOURCES) \ - $(libniash_la_SOURCES) $(libpie_la_SOURCES) \ - $(libpint_la_SOURCES) $(libpixma_la_SOURCES) \ - $(libplustek_la_SOURCES) $(libplustek_pp_la_SOURCES) \ - $(libpnm_la_SOURCES) $(libqcam_la_SOURCES) \ - $(libricoh_la_SOURCES) $(librts8891_la_SOURCES) \ - $(libs9036_la_SOURCES) $(libsceptre_la_SOURCES) \ - $(libsharp_la_SOURCES) $(libsm3600_la_SOURCES) \ - $(libsm3840_la_SOURCES) $(libsnapscan_la_SOURCES) \ - $(libsp15c_la_SOURCES) $(libst400_la_SOURCES) \ - $(libstv680_la_SOURCES) $(libtamarack_la_SOURCES) \ - $(libteco1_la_SOURCES) $(libteco2_la_SOURCES) \ - $(libteco3_la_SOURCES) $(libtest_la_SOURCES) \ - $(libu12_la_SOURCES) $(libumax_la_SOURCES) \ - $(libumax1220u_la_SOURCES) $(libumax_pp_la_SOURCES) \ - $(libv4l_la_SOURCES) $(libxerox_mfp_la_SOURCES) + $(libkvs1025_la_SOURCES) $(libleo_la_SOURCES) \ + $(liblexmark_la_SOURCES) $(libma1509_la_SOURCES) \ + $(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \ + $(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \ + $(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \ + $(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \ + $(libnet_la_SOURCES) $(libniash_la_SOURCES) \ + $(libpie_la_SOURCES) $(libpint_la_SOURCES) \ + $(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \ + $(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \ + $(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \ + $(librts8891_la_SOURCES) $(libs9036_la_SOURCES) \ + $(libsceptre_la_SOURCES) $(libsharp_la_SOURCES) \ + $(libsm3600_la_SOURCES) $(libsm3840_la_SOURCES) \ + $(libsnapscan_la_SOURCES) $(libsp15c_la_SOURCES) \ + $(libst400_la_SOURCES) $(libstv680_la_SOURCES) \ + $(libtamarack_la_SOURCES) $(libteco1_la_SOURCES) \ + $(libteco2_la_SOURCES) $(libteco3_la_SOURCES) \ + $(libtest_la_SOURCES) $(libu12_la_SOURCES) \ + $(libumax_la_SOURCES) $(libumax1220u_la_SOURCES) \ + $(libumax_pp_la_SOURCES) $(libv4l_la_SOURCES) \ + $(libxerox_mfp_la_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -1679,6 +1696,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \ libhp3500.la libhp3900.la libhp4200.la \ libhp5400.la libhp5590.la libhpljm1005.la \ libhpsj5s.la libhs2p.la libibm.la libkodak.la \ + libkvs1025.la \ libleo.la liblexmark.la libma1509.la \ libmatsushita.la libmicrotek.la libmicrotek2.la \ libmustek.la libmustek_pp.la libmustek_usb.la \ @@ -1711,6 +1729,7 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \ libsane-hp3500.la libsane-hp3900.la libsane-hp4200.la \ libsane-hp5400.la libsane-hp5590.la libsane-hpljm1005.la \ libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la \ + libsane-kvs1025.la \ libsane-leo.la libsane-lexmark.la libsane-ma1509.la \ libsane-matsushita.la libsane-microtek.la libsane-microtek2.la \ libsane-mustek.la libsane-mustek_pp.la libsane-mustek_usb.la \ @@ -1983,6 +2002,14 @@ nodist_libsane_kodak_la_SOURCES = kodak-s.c libsane_kodak_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodak libsane_kodak_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_kodak_la_LIBADD = $(COMMON_LIBS) libkodak.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) +libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \ + kvs1025.h kvs1025_low.h kvs1025_usb.h kvs1025_cmds.h + +libkvs1025_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs1025 +nodist_libsane_kvs1025_la_SOURCES = kvs1025-s.c +libsane_kvs1025_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs1025 +libsane_kvs1025_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) +libsane_kvs1025_la_LIBADD = $(COMMON_LIBS) libkvs1025.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) libleo_la_SOURCES = leo.c leo.h libleo_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=leo nodist_libsane_leo_la_SOURCES = leo-s.c @@ -2446,6 +2473,8 @@ libibm.la: $(libibm_la_OBJECTS) $(libibm_la_DEPENDENCIES) $(LINK) $(libibm_la_OBJECTS) $(libibm_la_LIBADD) $(LIBS) libkodak.la: $(libkodak_la_OBJECTS) $(libkodak_la_DEPENDENCIES) $(LINK) $(libkodak_la_OBJECTS) $(libkodak_la_LIBADD) $(LIBS) +libkvs1025.la: $(libkvs1025_la_OBJECTS) $(libkvs1025_la_DEPENDENCIES) + $(LINK) $(libkvs1025_la_OBJECTS) $(libkvs1025_la_LIBADD) $(LIBS) libleo.la: $(libleo_la_OBJECTS) $(libleo_la_DEPENDENCIES) $(LINK) $(libleo_la_OBJECTS) $(libleo_la_LIBADD) $(LIBS) liblexmark.la: $(liblexmark_la_OBJECTS) $(liblexmark_la_DEPENDENCIES) @@ -2572,6 +2601,8 @@ libsane-ibm.la: $(libsane_ibm_la_OBJECTS) $(libsane_ibm_la_DEPENDENCIES) $(libsane_ibm_la_LINK) $(libsane_ibm_la_OBJECTS) $(libsane_ibm_la_LIBADD) $(LIBS) libsane-kodak.la: $(libsane_kodak_la_OBJECTS) $(libsane_kodak_la_DEPENDENCIES) $(libsane_kodak_la_LINK) $(libsane_kodak_la_OBJECTS) $(libsane_kodak_la_LIBADD) $(LIBS) +libsane-kvs1025.la: $(libsane_kvs1025_la_OBJECTS) $(libsane_kvs1025_la_DEPENDENCIES) + $(libsane_kvs1025_la_LINK) $(libsane_kvs1025_la_OBJECTS) $(libsane_kvs1025_la_LIBADD) $(LIBS) libsane-leo.la: $(libsane_leo_la_OBJECTS) $(libsane_leo_la_DEPENDENCIES) $(libsane_leo_la_LINK) $(libsane_leo_la_OBJECTS) $(libsane_leo_la_LIBADD) $(LIBS) libsane-lexmark.la: $(libsane_lexmark_la_OBJECTS) $(libsane_lexmark_la_DEPENDENCIES) @@ -2762,6 +2793,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhs2p_la-hs2p.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libibm_la-ibm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkodak_la-kodak.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025_low.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025_opt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025_usb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libleo_la-leo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblexmark_la-lexmark.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblexmark_la-lexmark_low.Plo@am__quote@ @@ -2834,6 +2869,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hs2p_la-hs2p-s.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_ibm_la-ibm-s.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kodak_la-kodak-s.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_la-dll-s.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_leo_la-leo-s.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_lexmark_la-lexmark-s.Plo@am__quote@ @@ -3333,6 +3369,34 @@ libkodak_la-kodak.lo: kodak.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkodak_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkodak_la-kodak.lo `test -f 'kodak.c' || echo '$(srcdir)/'`kodak.c +libkvs1025_la-kvs1025.lo: kvs1025.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkvs1025_la-kvs1025.lo -MD -MP -MF $(DEPDIR)/libkvs1025_la-kvs1025.Tpo -c -o libkvs1025_la-kvs1025.lo `test -f 'kvs1025.c' || echo '$(srcdir)/'`kvs1025.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkvs1025_la-kvs1025.Tpo $(DEPDIR)/libkvs1025_la-kvs1025.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kvs1025.c' object='libkvs1025_la-kvs1025.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkvs1025_la-kvs1025.lo `test -f 'kvs1025.c' || echo '$(srcdir)/'`kvs1025.c + +libkvs1025_la-kvs1025_low.lo: kvs1025_low.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkvs1025_la-kvs1025_low.lo -MD -MP -MF $(DEPDIR)/libkvs1025_la-kvs1025_low.Tpo -c -o libkvs1025_la-kvs1025_low.lo `test -f 'kvs1025_low.c' || echo '$(srcdir)/'`kvs1025_low.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkvs1025_la-kvs1025_low.Tpo $(DEPDIR)/libkvs1025_la-kvs1025_low.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kvs1025_low.c' object='libkvs1025_la-kvs1025_low.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkvs1025_la-kvs1025_low.lo `test -f 'kvs1025_low.c' || echo '$(srcdir)/'`kvs1025_low.c + +libkvs1025_la-kvs1025_opt.lo: kvs1025_opt.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkvs1025_la-kvs1025_opt.lo -MD -MP -MF $(DEPDIR)/libkvs1025_la-kvs1025_opt.Tpo -c -o libkvs1025_la-kvs1025_opt.lo `test -f 'kvs1025_opt.c' || echo '$(srcdir)/'`kvs1025_opt.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkvs1025_la-kvs1025_opt.Tpo $(DEPDIR)/libkvs1025_la-kvs1025_opt.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kvs1025_opt.c' object='libkvs1025_la-kvs1025_opt.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkvs1025_la-kvs1025_opt.lo `test -f 'kvs1025_opt.c' || echo '$(srcdir)/'`kvs1025_opt.c + +libkvs1025_la-kvs1025_usb.lo: kvs1025_usb.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkvs1025_la-kvs1025_usb.lo -MD -MP -MF $(DEPDIR)/libkvs1025_la-kvs1025_usb.Tpo -c -o libkvs1025_la-kvs1025_usb.lo `test -f 'kvs1025_usb.c' || echo '$(srcdir)/'`kvs1025_usb.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkvs1025_la-kvs1025_usb.Tpo $(DEPDIR)/libkvs1025_la-kvs1025_usb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kvs1025_usb.c' object='libkvs1025_la-kvs1025_usb.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkvs1025_la-kvs1025_usb.lo `test -f 'kvs1025_usb.c' || echo '$(srcdir)/'`kvs1025_usb.c + libleo_la-leo.lo: leo.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libleo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libleo_la-leo.lo -MD -MP -MF $(DEPDIR)/libleo_la-leo.Tpo -c -o libleo_la-leo.lo `test -f 'leo.c' || echo '$(srcdir)/'`leo.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libleo_la-leo.Tpo $(DEPDIR)/libleo_la-leo.Plo @@ -3837,6 +3901,13 @@ libsane_kodak_la-kodak-s.lo: kodak-s.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_kodak_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsane_kodak_la-kodak-s.lo `test -f 'kodak-s.c' || echo '$(srcdir)/'`kodak-s.c +libsane_kvs1025_la-kvs1025-s.lo: kvs1025-s.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_kvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsane_kvs1025_la-kvs1025-s.lo -MD -MP -MF $(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Tpo -c -o libsane_kvs1025_la-kvs1025-s.lo `test -f 'kvs1025-s.c' || echo '$(srcdir)/'`kvs1025-s.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Tpo $(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kvs1025-s.c' object='libsane_kvs1025_la-kvs1025-s.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_kvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsane_kvs1025_la-kvs1025-s.lo `test -f 'kvs1025-s.c' || echo '$(srcdir)/'`kvs1025-s.c + libsane_leo_la-leo-s.lo: leo-s.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_leo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsane_leo_la-leo-s.lo -MD -MP -MF $(DEPDIR)/libsane_leo_la-leo-s.Tpo -c -o libsane_leo_la-leo-s.lo `test -f 'leo-s.c' || echo '$(srcdir)/'`leo-s.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_leo_la-leo-s.Tpo $(DEPDIR)/libsane_leo_la-leo-s.Plo diff --git a/configure b/configure index a0f7cdd7f..d12e51705 100755 --- a/configure +++ b/configure @@ -34197,6 +34197,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \ dell1600n_net dmc epjitsu epson epson2 fujitsu genesys \ gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 \ hp5590 hpsj5s hpljm1005 hs2p ibm kodak leo lexmark ma1509 \ + kvs1025 \ matsushita microtek microtek2 mustek mustek_pp \ mustek_usb mustek_usb2 nec net niash pie pint \ pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ diff --git a/configure.in b/configure.in index e49652299..73c9dc494 100644 --- a/configure.in +++ b/configure.in @@ -511,6 +511,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \ dell1600n_net dmc epjitsu epson epson2 fujitsu genesys \ gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 \ hp5590 hpsj5s hpljm1005 hs2p ibm kodak leo lexmark ma1509 \ + kvs1025 \ matsushita microtek microtek2 mustek mustek_pp \ mustek_usb mustek_usb2 nec net niash pie pint \ pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ diff --git a/doc/Makefile.am b/doc/Makefile.am index ac9953fe6..93284ea66 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -36,7 +36,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \ sane-mustek_usb2.5 sane-hp3500.5 sane-pixma.5 sane-stv680.5 \ sane-hp5590.5 sane-hpljm1005.5 sane-cardscan.5 sane-hp3900.5 \ sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5 sane-xerox_mfp.5 \ - sane-rts8891.5 sane-coolscan3.5 + sane-rts8891.5 sane-coolscan3.5 sane-kvs1025.5 EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \ sane-dll.man sane-dc25.man sane-dmc.man sane-epson.man \ @@ -60,7 +60,7 @@ EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \ sane-pixma.man sane-stv680.man sane-hp5590.man sane-hpljm1005.man \ sane-cardscan.man sane-hp3900.man sane-epjitsu.man sane-hs2p.man \ sane-canon_dr.man sane-xerox_mfp.man sane-rts8891.man \ - sane-coolscan3.man + sane-coolscan3.man sane-kvs1025.man man7_MANS = sane.7 EXTRA_DIST += sane.man @@ -172,7 +172,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.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/kodak.desc \ + descriptions/kodak.desc descriptions/kvs1025.desc \ descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \ descriptions/matsushita.desc descriptions/microtek2.desc \ descriptions/microtek.desc descriptions/mustek.desc \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 80045a675..69d122b67 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -279,9 +279,9 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \ sane-hpljm1005.man sane-cardscan.man sane-hp3900.man \ sane-epjitsu.man sane-hs2p.man sane-canon_dr.man \ sane-xerox_mfp.man sane-rts8891.man sane-coolscan3.man \ - sane.man saned.man descriptions.txt releases.txt \ - sane-logo2.jpg sane-logo.png sane.png sane.tex net.tex \ - html.sty $(DESC_FILES) descriptions/template.desc. \ + sane-kvs1025.man sane.man saned.man descriptions.txt \ + releases.txt sane-logo2.jpg sane-logo.png sane.png sane.tex \ + net.tex html.sty $(DESC_FILES) descriptions/template.desc. \ $(DESC_EXT_FILES) descriptions-external/template.desc. \ figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \ figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \ @@ -309,7 +309,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \ sane-mustek_usb2.5 sane-hp3500.5 sane-pixma.5 sane-stv680.5 \ sane-hp5590.5 sane-hpljm1005.5 sane-cardscan.5 sane-hp3900.5 \ sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5 sane-xerox_mfp.5 \ - sane-rts8891.5 sane-coolscan3.5 + sane-rts8891.5 sane-coolscan3.5 sane-kvs1025.5 man7_MANS = sane.7 man8_MANS = saned.8 @@ -374,7 +374,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.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/kodak.desc \ + descriptions/kodak.desc descriptions/kvs1025.desc \ descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \ descriptions/matsushita.desc descriptions/microtek2.desc \ descriptions/microtek.desc descriptions/mustek.desc \ @@ -875,7 +875,6 @@ descriptions.db: $(DESC_FILES) ../tools/sane-desc @../tools/sane-desc -m ascii -s ${srcdir}/descriptions \ > descriptions.db - descriptions-external.db: $(DESC_FILES) ../tools/sane-desc @../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \ > descriptions-external.db diff --git a/doc/sane.man b/doc/sane.man index 44b408f69..3bde4b3fb 100644 --- a/doc/sane.man +++ b/doc/sane.man @@ -325,6 +325,11 @@ The SANE backend for some large Kodak scanners. See .BR sane\-kodak (5) for details. .TP +.B kvs1025 +The SANE backend for Panasonic KV-S102xC scanners. See +.BR sane\-kvs1025 (5) +for details. +.TP .B leo This backend supports the Leo S3 and the Across FS-1130, which is a re-badged LEO FS-1130 scanner. See