From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- tools/Makefile.am | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'tools/Makefile.am') 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 > $@ -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- tools/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tools/Makefile.am') diff --git a/tools/Makefile.am b/tools/Makefile.am index 70c87ee..684815a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,6 +33,9 @@ CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \ RenSaneDlls.cmd README xerox +EXTRA_DIST += style-check.sh +EXTRA_DIST += create-changelog.sh +EXTRA_DIST += update-upstreams.sh sane_find_scanner_SOURCES = sane-find-scanner.c if have_usblib -- cgit v1.2.3 From ffa8801644a7d53cc1c785e3450f794c07a14eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Feb 2020 17:13:01 +0100 Subject: New upstream version 1.0.29 --- tools/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/Makefile.am') diff --git a/tools/Makefile.am b/tools/Makefile.am index 684815a..105d178 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -42,15 +42,15 @@ 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) $(XML_LIBS) \ ../backend/sane_strstatus.lo gamma4scanimage_SOURCES = gamma4scanimage.c 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 +umax_pp_SOURCES = umax_pp.c +umax_pp_SOURCES += ../backend/umax_pp_low.c +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 -- cgit v1.2.3