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

autoheader and automake 

After recent PNG and SNMP changes, need to run autoheader and automake
merge-requests/1/head
m. allan noah 2015-10-02 21:53:14 -04:00
rodzic 037346abfd
commit 2ecf18f6fb
14 zmienionych plików z 33 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
Makefile.in
Wyświetl plik

@ -329,7 +329,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

9
backend/Makefile.in
Wyświetl plik

@ -938,7 +938,8 @@ libsane_magicolor_la_DEPENDENCIES = $(COMMON_LIBS) libmagicolor.la \
sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \ sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo \ ../sanei/sanei_tcp.lo ../sanei/sanei_udp.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) \
$(am__DEPENDENCIES_1)
nodist_libsane_magicolor_la_OBJECTS = \ nodist_libsane_magicolor_la_OBJECTS = \
libsane_magicolor_la-magicolor-s.lo libsane_magicolor_la-magicolor-s.lo
libsane_magicolor_la_OBJECTS = $(nodist_libsane_magicolor_la_OBJECTS) libsane_magicolor_la_OBJECTS = $(nodist_libsane_magicolor_la_OBJECTS)
@ -1842,7 +1843,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
@ -2440,11 +2443,11 @@ libsane_ma1509_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=ma1509
libsane_ma1509_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_ma1509_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_ma1509_la_LIBADD = $(COMMON_LIBS) libma1509.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_ma1509_la_LIBADD = $(COMMON_LIBS) libma1509.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)
libmagicolor_la_SOURCES = magicolor.c magicolor.h libmagicolor_la_SOURCES = magicolor.c magicolor.h
libmagicolor_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=magicolor libmagicolor_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=magicolor $(SNMP_CFLAGS)
nodist_libsane_magicolor_la_SOURCES = magicolor-s.c nodist_libsane_magicolor_la_SOURCES = magicolor-s.c
libsane_magicolor_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=magicolor libsane_magicolor_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=magicolor
libsane_magicolor_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_magicolor_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_magicolor_la_LIBADD = $(COMMON_LIBS) libmagicolor.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS) libsane_magicolor_la_LIBADD = $(COMMON_LIBS) libmagicolor.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS) $(SNMP_LIBS)
libmatsushita_la_SOURCES = matsushita.c matsushita.h libmatsushita_la_SOURCES = matsushita.c matsushita.h
libmatsushita_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=matsushita libmatsushita_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=matsushita
nodist_libsane_matsushita_la_SOURCES = matsushita-s.c nodist_libsane_matsushita_la_SOURCES = matsushita-s.c

2
doc/Makefile.in
Wyświetl plik

@ -265,7 +265,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
frontend/Makefile.in
Wyświetl plik

@ -287,7 +287,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
include/Makefile.in
Wyświetl plik

@ -265,7 +265,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

3
include/sane/config.h.in
Wyświetl plik

@ -171,6 +171,9 @@
/* Define to 1 if you have the libjpeg library. */ /* Define to 1 if you have the libjpeg library. */
#undef HAVE_LIBJPEG #undef HAVE_LIBJPEG
/* Define to 1 if you have the libpng library. */
#undef HAVE_LIBPNG
/* Define to 1 if you have the net-snmp library. */ /* Define to 1 if you have the net-snmp library. */
#undef HAVE_LIBSNMP #undef HAVE_LIBSNMP

2
japi/Makefile.in
Wyświetl plik

@ -303,7 +303,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
lib/Makefile.in
Wyświetl plik

@ -272,7 +272,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
po/Makefile.in
Wyświetl plik

@ -220,7 +220,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
sanei/Makefile.in
Wyświetl plik

@ -281,7 +281,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
testsuite/Makefile.in
Wyświetl plik

@ -277,7 +277,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
testsuite/sanei/Makefile.in
Wyświetl plik

@ -493,7 +493,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
testsuite/tools/Makefile.in
Wyświetl plik

@ -217,7 +217,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@

2
tools/Makefile.in
Wyświetl plik

@ -322,7 +322,9 @@ SCSI_LIBS = @SCSI_LIBS@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SNMP_CFLAGS = @SNMP_CFLAGS@
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
SNMP_LIBS = @SNMP_LIBS@
SOCKET_LIBS = @SOCKET_LIBS@ SOCKET_LIBS = @SOCKET_LIBS@
STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@