kopia lustrzana https://gitlab.com/sane-project/backends
Various cleanups for release
m. allan noah
rodzic
364509b57f
commit
77c4ea1a7a
|
|
@ -1,3 +1,10 @@
|
|||
2012-07-24 m. allan noah <kitno455 at gmail dot com>
|
||||
* backend/kvs40xx_opt.c: Oops- it is new
|
||||
* doc/descriptions/kvs40xx.desc: Fix typo (Yuri Chornoivan)
|
||||
* po/uk.po: Updated (Yuri Chornoivan)
|
||||
* tools/Makefile.am, tools/Makefile.in, tools/sane-config.in:
|
||||
sane-config fixes (Ruediger Meier)
|
||||
|
||||
2012-07-15 Ilia Sotnikov <hostcc@gmail.com>
|
||||
* backend/hp5590.c, backend/hp5590_low.c:
|
||||
Fix hp5590 backend on big-endian platforms provided by Nhan Ngo Dinh
|
||||
|
|
|
|||
|
|
@ -402,8 +402,8 @@ init_options (struct scanner *s)
|
|||
o->name = "long-paper";
|
||||
o->title = SANE_I18N ("Long paper mode");
|
||||
o->desc = SANE_I18N ("Long Paper Mode is a mode that the scanner "
|
||||
"reads the image after it divides long paper"
|
||||
"by the length which is set in Document Size option");
|
||||
"reads the image after it divides long paper "
|
||||
"by the length which is set in Document Size option.");
|
||||
o->type = SANE_TYPE_BOOL;
|
||||
o->unit = SANE_UNIT_NONE;
|
||||
s->val[LONG_PAPER].w = SANE_FALSE;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
:manpage "sane-kvs40xx" ; name of manpage (if it exists)
|
||||
:comment "New backend for SANE release 1.0.23, see sane-kvs40xx manpage"
|
||||
:devicetype :scanner ; start of a list of devices....
|
||||
:new :yes
|
||||
|
||||
:mfg "Panasonic" ; name a manufacturer
|
||||
:url "http://www.panasonic.com/"
|
||||
|
|
|
|||
|
|
@ -48,6 +48,9 @@ EXTRA_DIST += hotplug/README hotplug/libusbscanner
|
|||
EXTRA_DIST += hotplug-ng/README hotplug-ng/libsane.hotplug
|
||||
EXTRA_DIST += openbsd/attach openbsd/detach
|
||||
|
||||
pkgconfigdir = @libdir@/pkgconfig
|
||||
pkgconfig_DATA = sane-backends.pc
|
||||
|
||||
# When build directory is not same as source directory then any
|
||||
# subdirectories that targets use must be manually created (under
|
||||
# the build directory that is).
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
@SET_MAKE@
|
||||
|
||||
|
||||
|
||||
VPATH = @srcdir@
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
|
@ -50,7 +51,8 @@ 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 =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
|
||||
"$(DESTDIR)$(pkgconfigdir)"
|
||||
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
|
||||
am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT)
|
||||
gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS)
|
||||
|
|
@ -105,6 +107,7 @@ 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)
|
||||
DATA = $(pkgconfig_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
|
@ -309,6 +312,8 @@ umax_pp_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax_pp_low
|
|||
umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la @MATH_LIB@
|
||||
sane_desc_SOURCES = sane-desc.c
|
||||
sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la
|
||||
pkgconfigdir = @libdir@/pkgconfig
|
||||
pkgconfig_DATA = sane-backends.pc
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
|
|
@ -529,6 +534,26 @@ mostlyclean-libtool:
|
|||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
install-pkgconfigDATA: $(pkgconfig_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
|
||||
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
done | $(am__base_list) | \
|
||||
while read files; do \
|
||||
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
|
||||
$(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
|
||||
done
|
||||
|
||||
uninstall-pkgconfigDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
test -n "$$files" || exit 0; \
|
||||
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
|
|
@ -615,9 +640,9 @@ distdir: $(DISTFILES)
|
|||
check-am: all-am
|
||||
check: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) check-am
|
||||
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
|
||||
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
|
||||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
|
|
@ -671,7 +696,7 @@ info: info-am
|
|||
|
||||
info-am:
|
||||
|
||||
install-data-am:
|
||||
install-data-am: install-pkgconfigDATA
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
|
|
@ -717,7 +742,8 @@ ps: ps-am
|
|||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
|
||||
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
.MAKE: all check install install-am install-strip
|
||||
|
||||
|
|
@ -729,12 +755,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
|
|||
install-binSCRIPTS install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
uninstall-binPROGRAMS uninstall-binSCRIPTS
|
||||
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
|
||||
install-ps-am install-strip installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-compile mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
# When build directory is not same as source directory then any
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ scriptname="sane-config"
|
|||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
|
||||
# using our installed *.pc only - neither default nor user paths
|
||||
export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
|
||||
export PKG_CONFIG_PATH=""
|
||||
|
||||
pkgconfig_package=sane-backends
|
||||
|
||||
usage ()
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue