* backend/Makefile.am, backend/xerox_mfp.conf.in: should use conf.in

merge-requests/1/head
m. allan noah 2009-02-24 17:49:02 +00:00
rodzic 37bdd088dc
commit 597bdcd400
4 zmienionych plików z 14 dodań i 5 usunięć

Wyświetl plik

@ -1,3 +1,6 @@
2009-02-24 m. allan noah <kitno455 a t gmail d o t com>
* backend/Makefile.am/in, backend/xerox_mfp.conf.in: should use conf.in
2009-02-23 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* backend/Makefile.am: Add back in deletion of $(sanelibdir)/libsane.*
for buggy libtools. Add some minor documentation.

Wyświetl plik

@ -95,7 +95,7 @@ BACKEND_CONFS= abaton.conf agfafocus.conf apple.conf artec.conf \
st400.conf stv680.conf tamarack.conf \
teco1.conf teco2.conf teco3.conf test.conf \
u12.conf umax1220u.conf umax.conf umax_pp.conf v4l.conf \
dll.conf saned.conf
xerox_mfp.conf dll.conf saned.conf
becfg: $(BACKEND_CONFS)
SUFFIXES = .conf.in .conf
@ -1012,6 +1012,7 @@ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS)
EXTRA_DIST += xerox_mfp.conf.in
libdll_la_SOURCES = dll.c
libdll_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
@ -1040,7 +1041,7 @@ EXTRA_DIST += dll.aliases
#
# FIXME: This is linking in every possible external library because there
# is the off chance user is using PRELOADABLE_BACKENDS that may need
# them. Since stanard mode is to only have the dll backend, its a waste.
# them. Since standard mode is to only have the dll backend, its a waste.
# Need to update configure to build a list of only what needs to go into
# LIBADD based on whats being preloaded.
nodist_libsane_la_SOURCES = dll-s.c dll-preload.h

Wyświetl plik

@ -1583,7 +1583,8 @@ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \
umax-scanner.h umax-scsidef.h umax-uc1200s.c umax-uc1200se.c \
umax-uc1260.c umax-uc630.c umax-uc840.c umax-ug630.c \
umax-ug80.c umax-usb.c umax1220u.conf.in umax1220u-common.c \
umax_pp.conf.in v4l.conf.in dll.conf.in dll.aliases
umax_pp.conf.in v4l.conf.in xerox_mfp.conf.in dll.conf.in \
dll.aliases
# Backends are not required to have a config file. Any backend
# that wants to install a config file should list it here.
@ -1605,7 +1606,7 @@ BACKEND_CONFS = abaton.conf agfafocus.conf apple.conf artec.conf \
st400.conf stv680.conf tamarack.conf \
teco1.conf teco2.conf teco3.conf test.conf \
u12.conf umax1220u.conf umax.conf umax_pp.conf v4l.conf \
dll.conf saned.conf
xerox_mfp.conf dll.conf saned.conf
SUFFIXES = .conf.in .conf
CLEANFILES = dll-preload.h $(BACKEND_CONFS) $(be_convenience_libs)
@ -2206,7 +2207,7 @@ libsane_dll_la_LIBADD = $(COMMON_LIBS) libdll.la ../sanei/sanei_init_debug.lo ..
#
# FIXME: This is linking in every possible external library because there
# is the off chance user is using PRELOADABLE_BACKENDS that may need
# them. Since stanard mode is to only have the dll backend, its a waste.
# them. Since standard mode is to only have the dll backend, its a waste.
# Need to update configure to build a list of only what needs to go into
# LIBADD based on whats being preloaded.
nodist_libsane_la_SOURCES = dll-s.c dll-preload.h

Wyświetl plik

@ -0,0 +1,4 @@
#xerox_mfp.conf
#Dell MFP Laser Printer 1815dn
usb 0x413c 0x5124