mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

automake for recent changes 

updates to mustek_usb2, canon_dr and umax_pp require automake run
merge-requests/1/head
m. allan noah 2015-11-08 17:17:37 -05:00
rodzic db7f038f10
commit 497d591806
2 zmienionych plików z 30 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
backend/Makefile.in
Wyświetl plik

@ -316,7 +316,9 @@ libmustek_usb_la_LIBADD =
am_libmustek_usb_la_OBJECTS = libmustek_usb_la-mustek_usb.lo am_libmustek_usb_la_OBJECTS = libmustek_usb_la-mustek_usb.lo
libmustek_usb_la_OBJECTS = $(am_libmustek_usb_la_OBJECTS) libmustek_usb_la_OBJECTS = $(am_libmustek_usb_la_OBJECTS)
libmustek_usb2_la_LIBADD = libmustek_usb2_la_LIBADD =
am_libmustek_usb2_la_OBJECTS = libmustek_usb2_la-mustek_usb2.lo am_libmustek_usb2_la_OBJECTS = libmustek_usb2_la-mustek_usb2.lo \
libmustek_usb2_la-mustek_usb2_high.lo \
libmustek_usb2_la-mustek_usb2_asic.lo
libmustek_usb2_la_OBJECTS = $(am_libmustek_usb2_la_OBJECTS) libmustek_usb2_la_OBJECTS = $(am_libmustek_usb2_la_OBJECTS)
libnec_la_LIBADD = libnec_la_LIBADD =
am_libnec_la_OBJECTS = libnec_la-nec.lo am_libnec_la_OBJECTS = libnec_la-nec.lo
@ -491,8 +493,9 @@ libsane_canon_dr_la_DEPENDENCIES = $(COMMON_LIBS) libcanon_dr.la \
../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \ ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
../sanei/sanei_config.lo ../sanei/sanei_config2.lo \ ../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \ sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
../sanei/sanei_magic.lo $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
nodist_libsane_canon_dr_la_OBJECTS = \ nodist_libsane_canon_dr_la_OBJECTS = \
libsane_canon_dr_la-canon_dr-s.lo libsane_canon_dr_la-canon_dr-s.lo
libsane_canon_dr_la_OBJECTS = $(nodist_libsane_canon_dr_la_OBJECTS) libsane_canon_dr_la_OBJECTS = $(nodist_libsane_canon_dr_la_OBJECTS)
@ -1952,7 +1955,6 @@ FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
# TODO: Why are these distributed but not compiled? # TODO: Why are these distributed but not compiled?
# TODO: Why are these distributed but not compiled? # TODO: Why are these distributed but not compiled?
# TODO: Why are these distributed but not compiled? # TODO: Why are these distributed but not compiled?
# TODO: Why are these distributed but not compiled?
# TODO: Why is this distributed but not installed? # TODO: Why is this distributed but not installed?
EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \
agfafocus.conf.in apple.conf.in artec.conf.in \ agfafocus.conf.in apple.conf.in artec.conf.in \
@ -1986,9 +1988,7 @@ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \
mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c \ mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c \
mustek_usb.conf.in mustek_usb_high.c mustek_usb_high.h \ mustek_usb.conf.in mustek_usb_high.c mustek_usb_high.h \
mustek_usb_low.c mustek_usb_low.h mustek_usb_mid.c \ mustek_usb_low.c mustek_usb_low.h mustek_usb_mid.c \
mustek_usb_mid.h mustek_usb2_asic.c mustek_usb2_asic.h \ mustek_usb_mid.h nec.conf.in net.conf.in niash_core.c \
mustek_usb2_high.c mustek_usb2_high.h mustek_usb2_reflective.c \
mustek_usb2_transparent.c nec.conf.in net.conf.in niash_core.c \
niash_core.h niash_xfer.c niash_xfer.h pie.conf.in \ niash_core.h niash_xfer.c niash_xfer.h pie.conf.in \
pieusb.conf.in p5.conf.in p5_device.c pixma.conf.in \ pieusb.conf.in p5.conf.in p5_device.c pixma.conf.in \
pixma_sane_options.c pixma_sane_options.h plustek.conf.in \ pixma_sane_options.c pixma_sane_options.h plustek.conf.in \
@ -2485,7 +2485,7 @@ nodist_libsane_mustek_usb_la_SOURCES = mustek_usb-s.c
libsane_mustek_usb_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb libsane_mustek_usb_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb
libsane_mustek_usb_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_mustek_usb_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_mustek_usb_la_LIBADD = $(COMMON_LIBS) libmustek_usb.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS) libsane_mustek_usb_la_LIBADD = $(COMMON_LIBS) libmustek_usb.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS)
libmustek_usb2_la_SOURCES = mustek_usb2.c mustek_usb2.h libmustek_usb2_la_SOURCES = mustek_usb2.c mustek_usb2.h mustek_usb2_high.c mustek_usb2_high.h mustek_usb2_asic.c mustek_usb2_asic.h
libmustek_usb2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb2 libmustek_usb2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb2
nodist_libsane_mustek_usb2_la_SOURCES = mustek_usb2-s.c nodist_libsane_mustek_usb2_la_SOURCES = mustek_usb2-s.c
libsane_mustek_usb2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb2 libsane_mustek_usb2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb2
@ -3482,6 +3482,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_la-mustek.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_la-mustek.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_pp_la-mustek_pp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_pp_la-mustek_pp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_usb2_la-mustek_usb2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_usb2_la-mustek_usb2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_usb2_la-mustek_usb2_asic.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_usb2_la-mustek_usb2_high.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_usb_la-mustek_usb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmustek_usb_la-mustek_usb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnec_la-nec.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnec_la-nec.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnet_la-net.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnet_la-net.Plo@am__quote@
@ -4305,6 +4307,20 @@ libmustek_usb2_la-mustek_usb2.lo: mustek_usb2.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmustek_usb2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmustek_usb2_la-mustek_usb2.lo `test -f 'mustek_usb2.c' || echo '$(srcdir)/'`mustek_usb2.c @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmustek_usb2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmustek_usb2_la-mustek_usb2.lo `test -f 'mustek_usb2.c' || echo '$(srcdir)/'`mustek_usb2.c
libmustek_usb2_la-mustek_usb2_high.lo: mustek_usb2_high.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmustek_usb2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmustek_usb2_la-mustek_usb2_high.lo -MD -MP -MF $(DEPDIR)/libmustek_usb2_la-mustek_usb2_high.Tpo -c -o libmustek_usb2_la-mustek_usb2_high.lo `test -f 'mustek_usb2_high.c' || echo '$(srcdir)/'`mustek_usb2_high.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmustek_usb2_la-mustek_usb2_high.Tpo $(DEPDIR)/libmustek_usb2_la-mustek_usb2_high.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mustek_usb2_high.c' object='libmustek_usb2_la-mustek_usb2_high.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmustek_usb2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmustek_usb2_la-mustek_usb2_high.lo `test -f 'mustek_usb2_high.c' || echo '$(srcdir)/'`mustek_usb2_high.c
libmustek_usb2_la-mustek_usb2_asic.lo: mustek_usb2_asic.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmustek_usb2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmustek_usb2_la-mustek_usb2_asic.lo -MD -MP -MF $(DEPDIR)/libmustek_usb2_la-mustek_usb2_asic.Tpo -c -o libmustek_usb2_la-mustek_usb2_asic.lo `test -f 'mustek_usb2_asic.c' || echo '$(srcdir)/'`mustek_usb2_asic.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmustek_usb2_la-mustek_usb2_asic.Tpo $(DEPDIR)/libmustek_usb2_la-mustek_usb2_asic.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mustek_usb2_asic.c' object='libmustek_usb2_la-mustek_usb2_asic.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmustek_usb2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmustek_usb2_la-mustek_usb2_asic.lo `test -f 'mustek_usb2_asic.c' || echo '$(srcdir)/'`mustek_usb2_asic.c
libnec_la-nec.lo: nec.c libnec_la-nec.lo: nec.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnec_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnec_la-nec.lo -MD -MP -MF $(DEPDIR)/libnec_la-nec.Tpo -c -o libnec_la-nec.lo `test -f 'nec.c' || echo '$(srcdir)/'`nec.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnec_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnec_la-nec.lo -MD -MP -MF $(DEPDIR)/libnec_la-nec.Tpo -c -o libnec_la-nec.lo `test -f 'nec.c' || echo '$(srcdir)/'`nec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnec_la-nec.Tpo $(DEPDIR)/libnec_la-nec.Plo @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnec_la-nec.Tpo $(DEPDIR)/libnec_la-nec.Plo

16
tools/Makefile.in
Wyświetl plik

@ -80,15 +80,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
@INSTALL_UMAX_PP_TOOLS_FALSE@bin_PROGRAMS = \ bin_PROGRAMS = sane-find-scanner$(EXEEXT) gamma4scanimage$(EXEEXT) \
@INSTALL_UMAX_PP_TOOLS_FALSE@ sane-find-scanner$(EXEEXT) \ $(am__EXEEXT_1)
@INSTALL_UMAX_PP_TOOLS_FALSE@ gamma4scanimage$(EXEEXT) noinst_PROGRAMS = sane-desc$(EXEEXT) $(am__EXEEXT_2)
@INSTALL_UMAX_PP_TOOLS_TRUE@bin_PROGRAMS = umax_pp$(EXEEXT) \ @INSTALL_UMAX_PP_TOOLS_TRUE@am__append_1 = umax_pp
@INSTALL_UMAX_PP_TOOLS_TRUE@ sane-find-scanner$(EXEEXT) \ @INSTALL_UMAX_PP_TOOLS_FALSE@am__append_2 = umax_pp
@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)
subdir = tools subdir = tools
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(srcdir)/sane-config.in \ $(top_srcdir)/mkinstalldirs $(srcdir)/sane-config.in \
@ -105,8 +101,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/include/sane/config.h CONFIG_HEADER = $(top_builddir)/include/sane/config.h
CONFIG_CLEAN_FILES = sane-config sane-backends.pc CONFIG_CLEAN_FILES = sane-config sane-backends.pc
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
@INSTALL_UMAX_PP_TOOLS_TRUE@am__EXEEXT_1 = umax_pp$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgconfigdir)"
@INSTALL_UMAX_PP_TOOLS_FALSE@am__EXEEXT_2 = umax_pp$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT) am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT)
gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS) gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS)