Imported Upstream version 2.7.4

This commit is contained in:
Laurent Bigonville 2016-07-18 02:11:41 +02:00
parent fd413a3168
commit c9cb2187ee
290 changed files with 7473 additions and 2607 deletions

View file

@ -243,6 +243,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
LIBDIR = @LIBDIR@
LIBGD_CFLAGS = @LIBGD_CFLAGS@
LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
@ -393,7 +394,7 @@ udevdir = @udevdir@
# sub-directory
SUBDIRS = . nut-scanner
EXTRA_DIST = nut-usbinfo.pl nut-recorder.sh nut-ddl-dump.sh \
gitlog2changelog.py nut-snmpinfo.py
gitlog2changelog.py nut-snmpinfo.py driver-list-format.sh
all: all-recursive
@ -740,6 +741,7 @@ nut-scanner-deps:
# call the USB info script upon "make dist", and if Perl is present
# call the SNMP info script upon "make dist", and if Python is present
# and call both for building nut-scanner
# Also ensure that data/driver.list is well formatted
dist-hook:
@if python -c 1; then \
echo "Regenerating the SNMP helper files."; \
@ -761,6 +763,8 @@ dist-hook:
echo "----------------------------------------------------------------------"; \
fi
@$(distdir)/driver-list-format.sh;
.PHONY: nut-scanner-deps nut-scanner-snmp-deps nut-scanner-usb-deps
# Tell versions [3.59,3.63) of GNU make to not export all variables.