Imported Upstream version 2.6.3

docs/Makefile.in

@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@@ -127,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@@ -159,6 +161,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@@ -179,6 +183,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@@ -210,12 +215,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -251,7 +258,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -275,10 +281,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevdir = @udevdir@
-SHARED_DEPS = nut-names.txt asciidoc.conf
 IMAGE_FILES = images/asciidoc.png \
 	images/eaton-logo.png \
 	images/nut_layering.png \
+	images/nut-logo.png \
 	images/note.png \
 	images/warning.png \
 	images/blue-arrow.png \
@@ -288,6 +294,9 @@ IMAGE_FILES = images/asciidoc.png \
 	images/bizarre.png \
 	images/old-cgi.png
 
+
+# Only track here the local deps
+SHARED_DEPS = nut-names.txt asciidoc.conf
 USER_MANUAL_DEPS = acknowledgements.txt cables.txt config-notes.txt	\
  configure.txt download.txt documentation.txt features.txt history.txt	\
  outlets.txt scheduling.txt security.txt support.txt user-manual.txt \
@@ -333,11 +342,13 @@ SUBDIRS = . man website
 SUFFIXES = .txt .html .pdf
 
 ### TODO: automatic dependency generation
-FULL_USER_MANUAL_DEPS = $(USER_MANUAL_DEPS)  $(SHARED_DEPS) ../README \
-	../INSTALL cables.txt ../UPGRADING ../TODO
+# Add other directory deps (not for local EXTRA_DIST) and generated contents
+FULL_USER_MANUAL_DEPS = $(USER_MANUAL_DEPS) $(SHARED_DEPS) ../README \
+	../INSTALL ../UPGRADING ../TODO
 
-FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS)  $(SHARED_DEPS) \
-	../scripts/augeas/README
+FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS) $(SHARED_DEPS) \
+	../scripts/augeas/README ../TODO ../lib/README \
+	../tools/nut-scanner/README
 
 
 # Note: without the "-v", asciidoc (circa 8.6.2) sometimes hangs when
@@ -350,6 +361,7 @@ A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
     --attribute iconsdir=$(srcdir)/images \
     --attribute=badges \
     --attribute=external_title \
+    --attribute tree_version=@TREE_VERSION@ \
     -a toc -a numbered --destination-dir=.
 
 all: all-recursive
@@ -714,6 +726,12 @@ html-chunked: $(ASCIIDOC_HTML_CHUNKED)
 clean-local:
 	rm -rf *.pdf *.html *.chunked docbook-xsl.css
 
+# Static HCL is generated automatically
+# This is more of a harness, since this file should have already been
+# generated, due to the top level Makefile SUBDIRS ordering (tools before docs)
+ups-html.txt:
+	cd ../tools; $(MAKE) $(AM_MAKEFLAGS) website
+
 user-manual.html user-manual.chunked user-manual.pdf: $(FULL_USER_MANUAL_DEPS)
 developer-guide.html developer-guide.chunked developer-guide.pdf: $(FULL_DEVELOPER_GUIDE_DEPS)
 packager-guide.html packager-guide.chunked packager-guide.pdf: packager-guide.txt asciidoc.conf