diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 35 | ||||
| -rw-r--r-- | tools/Makefile.in | 170 | ||||
| -rw-r--r-- | tools/README | 8 | ||||
| -rwxr-xr-x | tools/check-po.awk | 2 | ||||
| -rw-r--r-- | tools/check-usb-chip.c | 10 | ||||
| -rw-r--r-- | tools/sane-config.in | 2 | ||||
| -rw-r--r-- | tools/sane-find-scanner.c | 36 |
7 files changed, 128 insertions, 135 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 2024180..70c87ee 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,15 +4,15 @@ ## This file is part of the "Sane" build infra-structure. See ## included LICENSE file for license information. -AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ - -I$(top_srcdir)/include +AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \ + -I$(top_srcdir)/include $(USB_CFLAGS) bin_PROGRAMS = sane-find-scanner gamma4scanimage noinst_PROGRAMS = sane-desc if INSTALL_UMAX_PP_TOOLS -bin_PROGRAMS = umax_pp +bin_PROGRAMS += umax_pp else -noinst_PROGRAMS = umax_pp +noinst_PROGRAMS += umax_pp endif if CROSS_COMPILING @@ -34,17 +34,20 @@ CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \ RenSaneDlls.cmd README xerox -sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \ - ../backend/sane_strstatus.c +sane_find_scanner_SOURCES = sane-find-scanner.c +if have_usblib +sane_find_scanner_SOURCES += check-usb-chip.c +endif sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \ - @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@ + $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \ + ../backend/sane_strstatus.lo gamma4scanimage_SOURCES = gamma4scanimage.c -gamma4scanimage_LDADD = @MATH_LIB@ +gamma4scanimage_LDADD = $(MATH_LIB) -umax_pp_SOURCES = umax_pp.c ../backend/umax_pp_low.c -umax_pp_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax_pp_low -umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la @MATH_LIB@ +umax_pp_SOURCES = umax_pp.c +umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \ + ../backend/umax_pp_low.lo sane_desc_SOURCES = sane-desc.c sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la @@ -64,19 +67,21 @@ dirs: $(MKDIR_P) $$subdir || exit 1; \ done -hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +descriptions = ${top_srcdir}/doc/descriptions/*.desc ${top_srcdir}/doc/descriptions-external/*.desc + +hotplug/libsane.usermap: sane-desc $(descriptions) @./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 1 > $@ -hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +hotplug-ng/libsane.db: sane-desc $(descriptions) @./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 0 > $@ -udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +udev/libsane.rules: sane-desc $(descriptions) @./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 0 > $@ -hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +hal/libsane.fdi: sane-desc $(descriptions) @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 0 > $@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 49d5953..77e9d72 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -80,37 +80,42 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@INSTALL_UMAX_PP_TOOLS_FALSE@bin_PROGRAMS = \ -@INSTALL_UMAX_PP_TOOLS_FALSE@ sane-find-scanner$(EXEEXT) \ -@INSTALL_UMAX_PP_TOOLS_FALSE@ gamma4scanimage$(EXEEXT) -@INSTALL_UMAX_PP_TOOLS_TRUE@bin_PROGRAMS = umax_pp$(EXEEXT) \ -@INSTALL_UMAX_PP_TOOLS_TRUE@ sane-find-scanner$(EXEEXT) \ -@INSTALL_UMAX_PP_TOOLS_TRUE@ gamma4scanimage$(EXEEXT) -@INSTALL_UMAX_PP_TOOLS_FALSE@noinst_PROGRAMS = umax_pp$(EXEEXT) \ -@INSTALL_UMAX_PP_TOOLS_FALSE@ sane-desc$(EXEEXT) -@INSTALL_UMAX_PP_TOOLS_TRUE@noinst_PROGRAMS = sane-desc$(EXEEXT) +bin_PROGRAMS = sane-find-scanner$(EXEEXT) gamma4scanimage$(EXEEXT) \ + $(am__EXEEXT_1) +noinst_PROGRAMS = sane-desc$(EXEEXT) $(am__EXEEXT_2) +@INSTALL_UMAX_PP_TOOLS_TRUE@am__append_1 = umax_pp +@INSTALL_UMAX_PP_TOOLS_FALSE@am__append_2 = umax_pp +@have_usblib_TRUE@am__append_3 = check-usb-chip.c subdir = tools DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/mkinstalldirs $(srcdir)/sane-config.in \ $(srcdir)/sane-backends.pc.in $(top_srcdir)/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/sane/config.h CONFIG_CLEAN_FILES = sane-config sane-backends.pc CONFIG_CLEAN_VPATH_FILES = +@INSTALL_UMAX_PP_TOOLS_TRUE@am__EXEEXT_1 = umax_pp$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(pkgconfigdir)" +@INSTALL_UMAX_PP_TOOLS_FALSE@am__EXEEXT_2 = umax_pp$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT) gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS) -gamma4scanimage_DEPENDENCIES = +am__DEPENDENCIES_1 = +gamma4scanimage_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -118,14 +123,19 @@ am__v_lt_1 = am_sane_desc_OBJECTS = sane-desc.$(OBJEXT) sane_desc_OBJECTS = $(am_sane_desc_OBJECTS) sane_desc_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la +am__sane_find_scanner_SOURCES_DIST = sane-find-scanner.c \ + check-usb-chip.c +@have_usblib_TRUE@am__objects_1 = check-usb-chip.$(OBJEXT) am_sane_find_scanner_OBJECTS = sane-find-scanner.$(OBJEXT) \ - check-usb-chip.$(OBJEXT) sane_strstatus.$(OBJEXT) + $(am__objects_1) sane_find_scanner_OBJECTS = $(am_sane_find_scanner_OBJECTS) -sane_find_scanner_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la -am_umax_pp_OBJECTS = umax_pp-umax_pp.$(OBJEXT) \ - umax_pp-umax_pp_low.$(OBJEXT) +sane_find_scanner_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ../backend/sane_strstatus.lo +am_umax_pp_OBJECTS = umax_pp.$(OBJEXT) umax_pp_OBJECTS = $(am_umax_pp_OBJECTS) -umax_pp_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la +umax_pp_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \ + $(am__DEPENDENCIES_1) ../backend/umax_pp_low.lo am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -191,7 +201,7 @@ am__v_CCLD_1 = SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \ $(sane_find_scanner_SOURCES) $(umax_pp_SOURCES) DIST_SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \ - $(sane_find_scanner_SOURCES) $(umax_pp_SOURCES) + $(am__sane_find_scanner_SOURCES_DIST) $(umax_pp_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -221,7 +231,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \ + -I$(top_srcdir)/include $(USB_CFLAGS) AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -242,7 +256,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCLEAN_FILES = @DISTCLEAN_FILES@ +DLH = @DLH@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ @@ -255,34 +269,42 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FIG2DEV = @FIG2DEV@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@ GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@ GPHOTO2_LIBS = @GPHOTO2_LIBS@ GREP = @GREP@ +GS = @GS@ HAVE_GPHOTO2 = @HAVE_GPHOTO2@ IEEE1284_LIBS = @IEEE1284_LIBS@ -INCLUDES = @INCLUDES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_LOCKPATH = @INSTALL_LOCKPATH@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LATEX = @LATEX@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@ -LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@ LIBV4L_CFLAGS = @LIBV4L_CFLAGS@ LIBV4L_LIBS = @LIBV4L_LIBS@ -LINKER_RPATH = @LINKER_RPATH@ LIPO = @LIPO@ LN_S = @LN_S@ LOCKPATH_GROUP = @LOCKPATH_GROUP@ +LTALLOCA = @LTALLOCA@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINDEX = @MAKEINDEX@ @@ -291,10 +313,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ -NUMBER_VERSION = @NUMBER_VERSION@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -307,10 +329,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PNG_LIBS = @PNG_LIBS@ +POSUB = @POSUB@ +PPMTOGIF = @PPMTOGIF@ PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@ PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -332,12 +357,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ TIFF_LIBS = @TIFF_LIBS@ +USB_CFLAGS = @USB_CFLAGS@ USB_LIBS = @USB_LIBS@ +USE_NLS = @USE_NLS@ VERSION = @VERSION@ V_MAJOR = @V_MAJOR@ V_MINOR = @V_MINOR@ V_REV = @V_REV@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -393,9 +422,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ - -I$(top_srcdir)/include - @CROSS_COMPILING_FALSE@HOTPLUG = hal/libsane.fdi hotplug/libsane.usermap hotplug-ng/libsane.db \ @CROSS_COMPILING_FALSE@ udev/libsane.rules @@ -412,21 +438,22 @@ EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \ RenSaneDlls.cmd README xerox hotplug/README \ hotplug/libusbscanner hotplug-ng/README \ hotplug-ng/libsane.hotplug openbsd/attach openbsd/detach -sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \ - ../backend/sane_strstatus.c - +sane_find_scanner_SOURCES = sane-find-scanner.c $(am__append_3) sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \ - @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@ + $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \ + ../backend/sane_strstatus.lo gamma4scanimage_SOURCES = gamma4scanimage.c -gamma4scanimage_LDADD = @MATH_LIB@ -umax_pp_SOURCES = umax_pp.c ../backend/umax_pp_low.c -umax_pp_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax_pp_low -umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la @MATH_LIB@ +gamma4scanimage_LDADD = $(MATH_LIB) +umax_pp_SOURCES = umax_pp.c +umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \ + ../backend/umax_pp_low.lo + sane_desc_SOURCES = sane-desc.c sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la pkgconfigdir = @libdir@/pkgconfig pkgconfig_DATA = sane-backends.pc +descriptions = ${top_srcdir}/doc/descriptions/*.desc ${top_srcdir}/doc/descriptions-external/*.desc all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -586,73 +613,32 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma4scanimage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane-desc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane-find-scanner.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane_strstatus.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp-umax_pp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp-umax_pp_low.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -sane_strstatus.o: ../backend/sane_strstatus.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sane_strstatus.o -MD -MP -MF $(DEPDIR)/sane_strstatus.Tpo -c -o sane_strstatus.o `test -f '../backend/sane_strstatus.c' || echo '$(srcdir)/'`../backend/sane_strstatus.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sane_strstatus.Tpo $(DEPDIR)/sane_strstatus.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../backend/sane_strstatus.c' object='sane_strstatus.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sane_strstatus.o `test -f '../backend/sane_strstatus.c' || echo '$(srcdir)/'`../backend/sane_strstatus.c - -sane_strstatus.obj: ../backend/sane_strstatus.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sane_strstatus.obj -MD -MP -MF $(DEPDIR)/sane_strstatus.Tpo -c -o sane_strstatus.obj `if test -f '../backend/sane_strstatus.c'; then $(CYGPATH_W) '../backend/sane_strstatus.c'; else $(CYGPATH_W) '$(srcdir)/../backend/sane_strstatus.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sane_strstatus.Tpo $(DEPDIR)/sane_strstatus.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../backend/sane_strstatus.c' object='sane_strstatus.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sane_strstatus.obj `if test -f '../backend/sane_strstatus.c'; then $(CYGPATH_W) '../backend/sane_strstatus.c'; else $(CYGPATH_W) '$(srcdir)/../backend/sane_strstatus.c'; fi` - -umax_pp-umax_pp.o: umax_pp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp.o -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp.Tpo -c -o umax_pp-umax_pp.o `test -f 'umax_pp.c' || echo '$(srcdir)/'`umax_pp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp.Tpo $(DEPDIR)/umax_pp-umax_pp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='umax_pp.c' object='umax_pp-umax_pp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp.o `test -f 'umax_pp.c' || echo '$(srcdir)/'`umax_pp.c - -umax_pp-umax_pp.obj: umax_pp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp.obj -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp.Tpo -c -o umax_pp-umax_pp.obj `if test -f 'umax_pp.c'; then $(CYGPATH_W) 'umax_pp.c'; else $(CYGPATH_W) '$(srcdir)/umax_pp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp.Tpo $(DEPDIR)/umax_pp-umax_pp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='umax_pp.c' object='umax_pp-umax_pp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp.obj `if test -f 'umax_pp.c'; then $(CYGPATH_W) 'umax_pp.c'; else $(CYGPATH_W) '$(srcdir)/umax_pp.c'; fi` - -umax_pp-umax_pp_low.o: ../backend/umax_pp_low.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp_low.o -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp_low.Tpo -c -o umax_pp-umax_pp_low.o `test -f '../backend/umax_pp_low.c' || echo '$(srcdir)/'`../backend/umax_pp_low.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp_low.Tpo $(DEPDIR)/umax_pp-umax_pp_low.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../backend/umax_pp_low.c' object='umax_pp-umax_pp_low.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp_low.o `test -f '../backend/umax_pp_low.c' || echo '$(srcdir)/'`../backend/umax_pp_low.c - -umax_pp-umax_pp_low.obj: ../backend/umax_pp_low.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp_low.obj -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp_low.Tpo -c -o umax_pp-umax_pp_low.obj `if test -f '../backend/umax_pp_low.c'; then $(CYGPATH_W) '../backend/umax_pp_low.c'; else $(CYGPATH_W) '$(srcdir)/../backend/umax_pp_low.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp_low.Tpo $(DEPDIR)/umax_pp-umax_pp_low.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../backend/umax_pp_low.c' object='umax_pp-umax_pp_low.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp_low.obj `if test -f '../backend/umax_pp_low.c'; then $(CYGPATH_W) '../backend/umax_pp_low.c'; else $(CYGPATH_W) '$(srcdir)/../backend/umax_pp_low.c'; fi` - mostlyclean-libtool: -rm -f *.lo @@ -903,19 +889,19 @@ dirs: $(MKDIR_P) $$subdir || exit 1; \ done -hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +hotplug/libsane.usermap: sane-desc $(descriptions) @./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 1 > $@ -hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +hotplug-ng/libsane.db: sane-desc $(descriptions) @./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 0 > $@ -udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +udev/libsane.rules: sane-desc $(descriptions) @./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 0 > $@ -hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc +hal/libsane.fdi: sane-desc $(descriptions) @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -d 0 > $@ diff --git a/tools/README b/tools/README index 6002113..10d0d95 100644 --- a/tools/README +++ b/tools/README @@ -68,7 +68,9 @@ Maybe useful for SANE developers: check-po.awk: Print untranslated and fuzzy messages and their line numbers in the source code and po file. Example: - cd po/ ; ../tools/check-po.awk sane-backends.de.po - You may need to adjust the path of awk in the first line of the - script. More documentation is in the script itself. + tools/check-po.awk po/de.po + You may need to adjust the path of gawk in the first line of the + script. Alternatively, run it via gawk's -f option, like so: + gawk -f tools/check-po.awk po/de.po + More documentation is in the script itself. diff --git a/tools/check-po.awk b/tools/check-po.awk index 25e0728..09e4d15 100755 --- a/tools/check-po.awk +++ b/tools/check-po.awk @@ -1,4 +1,4 @@ -#!/bin/awk -f +#!/usr/bin/gawk -f # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff --git a/tools/check-usb-chip.c b/tools/check-usb-chip.c index e851855..50b3e88 100644 --- a/tools/check-usb-chip.c +++ b/tools/check-usb-chip.c @@ -28,7 +28,7 @@ #include "../include/sane/config.h" -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY #include "../include/sane/sane.h" #include <stdio.h> @@ -1408,7 +1408,7 @@ check_gl646 (struct usb_device *dev) return "GL646"; } -/* Same as check_gl646, except that sanity check are different. */ +/* Same as check_gl646, except that sanity checks are different. */ static char * check_gl646_hp (struct usb_device *dev) { @@ -3430,9 +3430,9 @@ check_usb_chip (struct usb_device *dev, int verbosity, SANE_Bool from_file) return chip_name; } -#endif /* HAVE_LIBUSB */ +#endif /* HAVE_LIBUSB_LEGACY */ -#ifdef HAVE_LIBUSB_1_0 +#ifdef HAVE_LIBUSB #include <libusb.h> @@ -4335,4 +4335,4 @@ check_usb_chip (int verbosity, libusb_release_interface (hdl, 0); return chip_name; } -#endif /* HAVE_LIBUSB_1_0 */ +#endif /* HAVE_LIBUSB */ diff --git a/tools/sane-config.in b/tools/sane-config.in index 8e4b52a..6b7cd30 100644 --- a/tools/sane-config.in +++ b/tools/sane-config.in @@ -37,7 +37,7 @@ fi if test $# -gt 0; then case $1 in --version) - echo @NUMBER_VERSION@ + echo @V_MAJOR@.@V_MINOR@.@V_REV@ ;; --help) if test $# -eq 1; then diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c index ae0e116..04f19d9 100644 --- a/tools/sane-find-scanner.c +++ b/tools/sane-find-scanner.c @@ -46,7 +46,7 @@ #include "../include/sane/sanei_pa4s2.h" #include "../include/sane/sanei_config.h" -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY #ifdef HAVE_LUSB0_USB_H #include <lusb0_usb.h> #else @@ -55,7 +55,7 @@ extern char * check_usb_chip (struct usb_device *dev, int verbosity, SANE_Bool from_file); #endif -#ifdef HAVE_LIBUSB_1_0 +#ifdef HAVE_LIBUSB #include <libusb.h> extern char * check_usb_chip (int verbosity, struct libusb_device_descriptor desc, @@ -76,7 +76,7 @@ static SANE_Bool device_found = SANE_FALSE; static SANE_Bool libusb_device_found = SANE_FALSE; static SANE_Bool unknown_found = SANE_FALSE; -#ifdef HAVE_LIBUSB_1_0 +#ifdef HAVE_LIBUSB libusb_context *sfs_usb_ctx; #endif @@ -115,7 +115,7 @@ usage (char *msg) fprintf (stderr, "\t-f: force opening devname as SCSI even if it looks " "like USB\n"); fprintf (stderr, "\t-p: enable scanning for parallel port devices\n"); -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY fprintf (stderr, "\t-F file: try to detect chipset from given " "/proc/bus/usb/devices file\n"); #endif @@ -403,7 +403,7 @@ check_usb_file (char *file_name) } } -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY static char * get_libusb_string_descriptor (struct usb_device *dev, int index) @@ -701,10 +701,10 @@ check_libusb_device (struct usb_device *dev, SANE_Bool from_file) if (product) free (product); } -#endif /* HAVE_LIBUSB */ +#endif /* HAVE_LIBUSB_LEGACY */ -#ifdef HAVE_LIBUSB_1_0 +#ifdef HAVE_LIBUSB static char * sfs_libusb_strerror (int errcode) { @@ -1095,7 +1095,7 @@ check_libusb_device (libusb_device *dev, SANE_Bool from_file) if (product) free (product); } -#endif /* HAVE_LIBUSB_1_0 */ +#endif /* HAVE_LIBUSB */ static DIR * @@ -1355,7 +1355,7 @@ check_mustek_pp_device (void) return (found > 0 || scsi > 0); } -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY static SANE_Bool parse_num (char* search, const char* line, int base, long int * number) { @@ -1596,9 +1596,9 @@ main (int argc, char **argv) break; case 'F': -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY parse_file ((char *) (*(++ap))); -#elif defined(HAVE_LIBUSB_1_0) +#elif defined(HAVE_LIBUSB) printf ("option -F not implemented with libusb-1.0\n"); #else printf ("libusb not available: option -F can't be used\n"); @@ -1797,7 +1797,7 @@ main (int argc, char **argv) "/dev/scanner", "/dev/scanner0", "/dev/scanner1", "/dev/pass0", "/dev/pass1", "/dev/pass2", "/dev/pass3", "/dev/pass4", "/dev/pass5", "/dev/pass6", "/dev/pass7", -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) "/dev/uk0", "/dev/uk1", "/dev/uk2", "/dev/uk3", "/dev/uk4", "/dev/uk5", "/dev/uk6", #elif defined(__NetBSD__) @@ -1948,7 +1948,7 @@ main (int argc, char **argv) check_usb_file (dev_name); } } -#ifdef HAVE_LIBUSB +#ifdef HAVE_LIBUSB_LEGACY /* Now the libusb devices */ { struct usb_bus *bus; @@ -1973,7 +1973,7 @@ main (int argc, char **argv) } /* for (bus) */ } } -#elif defined(HAVE_LIBUSB_1_0) +#elif defined(HAVE_LIBUSB) /* Now the libusb-1.0 devices */ { if (ap < argv + argc) @@ -2026,10 +2026,10 @@ main (int argc, char **argv) ; /* init failed, jumping here */ } } -#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */ +#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */ if (verbose > 1) printf ("libusb not available\n"); -#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */ +#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */ if (device_found) { @@ -2062,7 +2062,7 @@ main (int argc, char **argv) "make sure that\n # you have loaded a kernel driver for your USB host " "controller and have setup\n # the USB system correctly. " "See man sane-usb for details.\n"); -#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0) +#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB) if (verbose > 0) printf (" # SANE has been built without libusb support. This may be a " "reason\n # for not detecting USB scanners. Read README for " @@ -2074,7 +2074,7 @@ main (int argc, char **argv) if (!check_mustek_pp_device() && verbose > 0) printf ("\n # No Mustek parallel port scanners found. If you expected" " something\n # different, make sure the scanner is correctly" - " connected to your computer\n # and you have apropriate" + " connected to your computer\n # and you have appropriate" " access rights.\n"); } else if (verbose > 0) |