* Makefile.am, configure.in, doc/Makefile.am: Convert

doc/Makefile to use automake. Main difference is that no longer installs man pages for backends that are not compiled. Moved install ownership of $top_srcdir docs to $top_srcdir's Makefile.
2009-02-14 05:54:01 +00:00 · 2009-02-14 05:54:01 +00:00 · 79086e770e
commit 79086e770e
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2009-02-13 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
+	* Makefile.am, configure.in, doc/Makefile.am: Convert
+	doc/Makefile to use automake. Main difference is that
+	no longer installs man pages for backends that are not
+	compiled.  Moved install ownership of $top_srcdir docs
+	to $top_srcdir's Makefile.
+
 2009-02-06 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
 	* configure.in, backend/Makefile.am: Add back change to
 	use -version-number even though its known not to work on
--- a/Makefile.am
+++ b/Makefile.am
@ -7,17 +7,17 @@
 SUBDIRS = include lib sanei backend frontend tools doc po
 DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite

-EXTRA_DIST = AUTHORS ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
- ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
- ChangeLog-1.0.6 ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 \
- ChangeLog-1.0.10 ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 \
- ChangeLog-1.0.15 ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 \
- ChangeLog-1.0.19 \
- LICENSE PROBLEMS PROJECTS \
- README.aix README.beos README.darwin README.djpeg README.freebsd \
+dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+ README README.aix README.beos README.darwin README.djpeg README.freebsd \
 README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
 README.solaris README.unixware2 README.unixware7 README.windows \
- README.zeta $(PACKAGE).lsm
+ README.zeta
+EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
+ ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
+ ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
+ ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 ChangeLog-1.0.15 \
+ ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 ChangeLog-1.0.19 \
+ $(PACKAGE).lsm

 #
 # Keep the .cvsignore files sorted, and use this target to do it.
--- a/Makefile.in
+++ b/Makefile.in
@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@ -32,11 +33,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/doc/Makefile.in \
-	$(top_srcdir)/doc/doxygen-sanei.conf.in \
-	$(top_srcdir)/frontend/Makefile.in \
+DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/configure $(top_srcdir)/frontend/Makefile.in \
 	$(top_srcdir)/include/Makefile.in \
 	$(top_srcdir)/include/sane/config.h.in \
 	$(top_srcdir)/japi/Makefile.in $(top_srcdir)/po/Makefile.in \
@ -57,8 +56,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/sane/config.h
 CONFIG_CLEAN_FILES = sanei/Makefile frontend/Makefile japi/Makefile \
-	include/Makefile doc/Makefile po/Makefile testsuite/Makefile \
-	tools/Makefile doc/doxygen-sanei.conf tools/sane-config
+	include/Makefile po/Makefile testsuite/Makefile tools/Makefile \
+	tools/sane-config
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@ -68,6 +67,15 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(docdir)"
+dist_docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_doc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@ -96,6 +104,7 @@ AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
 BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
+BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@ -109,7 +118,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPEND_RECURSIVE = @DEPEND_RECURSIVE@
 DISTCLEAN_FILES = @DISTCLEAN_FILES@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
@ -150,7 +158,6 @@ LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAKEDEPEND = @MAKEDEPEND@
 MAKEINDEX = @MAKEINDEX@
 MAKEINFO = @MAKEINFO@
 MATH_LIB = @MATH_LIB@
@ -188,7 +195,6 @@ STRIP = @STRIP@
 SYSLOG_LIBS = @SYSLOG_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
 USB_LIBS = @USB_LIBS@
-USE_LATEX = @USE_LATEX@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
@ -250,17 +256,18 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = include lib sanei backend frontend tools doc po
 DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
-EXTRA_DIST = AUTHORS ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
- ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
- ChangeLog-1.0.6 ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 \
- ChangeLog-1.0.10 ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 \
- ChangeLog-1.0.15 ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 \
- ChangeLog-1.0.19 \
- LICENSE PROBLEMS PROJECTS \
- README.aix README.beos README.darwin README.djpeg README.freebsd \
+dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+ README README.aix README.beos README.darwin README.djpeg README.freebsd \
 README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
 README.solaris README.unixware2 README.unixware7 README.windows \
- README.zeta $(PACKAGE).lsm
+ README.zeta
+
+EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
+ ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
+ ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
+ ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 ChangeLog-1.0.15 \
+ ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 ChangeLog-1.0.19 \
+ $(PACKAGE).lsm


 #
@ -328,16 +335,12 @@ japi/Makefile: $(top_builddir)/config.status $(top_srcdir)/japi/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 include/Makefile: $(top_builddir)/config.status $(top_srcdir)/include/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-doc/Makefile: $(top_builddir)/config.status $(top_srcdir)/doc/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 po/Makefile: $(top_builddir)/config.status $(top_srcdir)/po/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 testsuite/Makefile: $(top_builddir)/config.status $(top_srcdir)/testsuite/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 tools/Makefile: $(top_builddir)/config.status $(top_srcdir)/tools/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-doc/doxygen-sanei.conf: $(top_builddir)/config.status $(top_srcdir)/doc/doxygen-sanei.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 tools/sane-config: $(top_builddir)/config.status $(top_srcdir)/tools/sane-config.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@

@ -349,6 +352,23 @@ clean-libtool:

 distclean-libtool:
 	-rm -f libtool
+install-dist_docDATA: $(dist_doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+uninstall-dist_docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done

 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@ -630,9 +650,12 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@ -677,7 +700,7 @@ info: info-recursive

 info-am:

-install-data-am:
+install-data-am: install-dist_docDATA

 install-dvi: install-dvi-recursive

@ -713,7 +736,7 @@ ps: ps-recursive

 ps-am:

-uninstall-am:
+uninstall-am: uninstall-dist_docDATA

 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@ -726,14 +749,15 @@ uninstall-am:
 	distclean-libtool distclean-local distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	install-data-am install-dist_docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_docDATA

 sort-cvsignore:
 	for f in `find . -name .cvsignore`; do \
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@ -1272,6 +1272,7 @@ AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
 BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
+BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@ -1285,7 +1286,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPEND_RECURSIVE = @DEPEND_RECURSIVE@
 DISTCLEAN_FILES = @DISTCLEAN_FILES@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
@ -1328,7 +1328,6 @@ LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAKEDEPEND = @MAKEDEPEND@
 MAKEINDEX = @MAKEINDEX@
 MAKEINFO = @MAKEINFO@
 MATH_LIB = @MATH_LIB@
@ -1366,7 +1365,6 @@ STRIP = @STRIP@
 SYSLOG_LIBS = @SYSLOG_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
 USB_LIBS = @USB_LIBS@
-USE_LATEX = @USE_LATEX@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
--- a/133
+++ b/133
@ -792,8 +792,10 @@ ac_includes_default="\

 ac_subst_vars='LTLIBOBJS
 DISTCLEAN_FILES
-USE_LATEX
+USE_LATEX_FALSE
+USE_LATEX_TRUE
 INSTALL_TRANSLATIONS
+BACKEND_MANS_ENABLED
 BACKEND_CONFS_ENABLED
 PRELOADABLE_BACKENDS_ENABLED
 PRELOADABLE_BACKENDS
@ -851,9 +853,9 @@ effective_target
 LINKER_RPATH
 STRICT_LDFLAGS
 INCLUDES
+CROSS_COMPILING_FALSE
+CROSS_COMPILING_TRUE
 CROSS_COMPILING
-DEPEND_RECURSIVE
-MAKEDEPEND
 MAKEINDEX
 DVIPS
 LATEX
@ -4737,45 +4739,6 @@ $as_echo "no" >&6; }
 fi


-# Extract the first word of "makedepend$EXEEXT", so it can be a program name with args.
-set dummy makedepend$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MAKEDEPEND+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $MAKEDEPEND in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MAKEDEPEND="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MAKEDEPEND" && ac_cv_path_MAKEDEPEND="no"
-  ;;
-esac
-fi
-MAKEDEPEND=$ac_cv_path_MAKEDEPEND
-if test -n "$MAKEDEPEND"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
-$as_echo "$MAKEDEPEND" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi



@ -4783,13 +4746,16 @@ fi



-
-if test "$MAKEDEPEND" != "no"; then
-  DEPEND_RECURSIVE="depend-recursive"
-fi
-
-
 CROSS_COMPILING=$cross_compiling
+# FIXME: Remove AC_SUBSAT once tools directory is done
+
+ if test x$cross_compiling = xyes; then
+  CROSS_COMPILING_TRUE=
+  CROSS_COMPILING_FALSE='#'
+else
+  CROSS_COMPILING_TRUE='#'
+  CROSS_COMPILING_FALSE=
+fi


 INCLUDES="${INCLUDES} -I/usr/local/include"
@ -15979,7 +15945,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 15982 "configure"' > conftest.$ac_ext
+  echo '#line 15948 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -18859,11 +18825,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18862: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18828: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:18866: \$? = $ac_status" >&5
+   echo "$as_me:18832: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -19149,11 +19115,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19152: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19118: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:19156: \$? = $ac_status" >&5
+   echo "$as_me:19122: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -19253,11 +19219,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19256: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19222: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:19260: \$? = $ac_status" >&5
+   echo "$as_me:19226: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -21655,7 +21621,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 21658 "configure"
+#line 21624 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -21755,7 +21721,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 21758 "configure"
+#line 21724 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -24168,11 +24134,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:24171: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:24137: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:24175: \$? = $ac_status" >&5
+   echo "$as_me:24141: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -24272,11 +24238,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:24275: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:24241: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:24279: \$? = $ac_status" >&5
+   echo "$as_me:24245: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -25857,11 +25823,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:25860: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:25826: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:25864: \$? = $ac_status" >&5
+   echo "$as_me:25830: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -25961,11 +25927,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:25964: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:25930: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:25968: \$? = $ac_status" >&5
+   echo "$as_me:25934: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -28182,11 +28148,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28185: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28151: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:28189: \$? = $ac_status" >&5
+   echo "$as_me:28155: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -28472,11 +28438,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28475: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28441: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:28479: \$? = $ac_status" >&5
+   echo "$as_me:28445: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -28576,11 +28542,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28579: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28545: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:28583: \$? = $ac_status" >&5
+   echo "$as_me:28549: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -31453,9 +31419,11 @@ fi
 BACKENDS="$FILTERED_BACKENDS"
 BACKEND_LIBS_ENABLED=""
 BACKEND_CONFS_ENABLED=""
+BACKEND_MANS_ENABLED=""
 for backend in ${BACKENDS} ; do
  BACKEND_LIBS_ENABLED="${BACKEND_LIBS_ENABLED} libsane-${backend}.la"
  BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf"
+  BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5"
 done


@ -31598,6 +31566,7 @@ PRELOADABLE_BACKENDS_ENABLED=""
 # of all backends.
 for backend in ${PRELOADABLE_BACKENDS} ; do
  BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf"
+  BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5"
  # Special hacks.  Normally, we create a convenience library that
  # matches the backend's name but in some cases that will conflict
  # with an external library name that also matches backend name.
@ -31612,6 +31581,7 @@ done



+
 case $host_os in
  beos*)
  libdir='${exec_prefix}/add-ons'
@ -31660,6 +31630,13 @@ if test "$LATEX" != "no" && test "$DVIPS" != "no" && test "$MAKEINDEX" != "no" ;
 else
  USE_LATEX="no"
 fi
+ if test x$USE_LATEX = xyes; then
+  USE_LATEX_TRUE=
+  USE_LATEX_FALSE='#'
+else
+  USE_LATEX_TRUE='#'
+  USE_LATEX_FALSE=
+fi



@ -31788,6 +31765,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
   { (exit 1); exit 1; }; }
 fi
+if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi


 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
@ -31797,6 +31781,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
   { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_LATEX_TRUE}" && test -z "${USE_LATEX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LATEX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"USE_LATEX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi

 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
--- a/configure.in
+++ b/configure.in
@ -66,20 +66,17 @@ AC_PATH_PROG(MSGMERGE, msgmerge$EXEEXT, no)
 AC_PATH_PROG(LATEX, latex$EXEEXT, no)
 AC_PATH_PROG(DVIPS, dvips$EXEEXT, no)
 AC_PATH_PROG(MAKEINDEX, makeindex$EXEEXT, no)
-AC_PATH_PROG(MAKEDEPEND, makedepend$EXEEXT, no)
 AC_SUBST(MSGFMT)
 AC_SUBST(XGETTEXT)
 AC_SUBST(MSGMERGE)
 AC_SUBST(LATEX)
 AC_SUBST(DVIPS)
 AC_SUBST(MAKEINDEX)
-if test "$MAKEDEPEND" != "no"; then
-  DEPEND_RECURSIVE="depend-recursive"
-fi
-AC_SUBST(DEPEND_RECURSIVE)

 CROSS_COMPILING=$cross_compiling
+# FIXME: Remove AC_SUBSAT once tools directory is done
 AC_SUBST(CROSS_COMPILING)
+AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)

 dnl ***********************************************************************
 dnl set compiler/linker flags
@ -529,9 +526,11 @@ AC_ARG_ENABLE(pnm-backend,
 BACKENDS="$FILTERED_BACKENDS"
 BACKEND_LIBS_ENABLED=""
 BACKEND_CONFS_ENABLED=""
+BACKEND_MANS_ENABLED=""
 for backend in ${BACKENDS} ; do
  BACKEND_LIBS_ENABLED="${BACKEND_LIBS_ENABLED} libsane-${backend}.la"
  BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf"
+  BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5"
 done
 AC_SUBST(BACKEND_LIBS_ENABLED)

@ -572,6 +571,7 @@ PRELOADABLE_BACKENDS_ENABLED=""
 # of all backends.
 for backend in ${PRELOADABLE_BACKENDS} ; do
  BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf"
+  BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5"
  # Special hacks.  Normally, we create a convenience library that
  # matches the backend's name but in some cases that will conflict
  # with an external library name that also matches backend name.
@ -585,6 +585,7 @@ done
 AC_SUBST(PRELOADABLE_BACKENDS)
 AC_SUBST(PRELOADABLE_BACKENDS_ENABLED)
 AC_SUBST(BACKEND_CONFS_ENABLED)
+AC_SUBST(BACKEND_MANS_ENABLED)

 dnl in BeOS, backends are not installed in lib/sane, but add-ons/sane/
 dnl we account for both installing in /boot/beos and ~/config
@ -634,7 +635,7 @@ if test "$LATEX" != "no" && test "$DVIPS" != "no" && test "$MAKEINDEX" != "no" ;
 else
  USE_LATEX="no"
 fi
-AC_SUBST(USE_LATEX)
+AM_CONDITIONAL(USE_LATEX, test x$USE_LATEX = xyes)

 dnl ***********************************************************************
 dnl Write output files
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -0,0 +1,313 @@
+##  Makefile.am -- an automake template for Makefile.in file
+##  Copyright (C) 2009 Chris Bagwell and Sane Developers.
+##
+##  This file is part of the "Sane" build infra-structure.  See
+##  included LICENSE file for license information.
+
+man1_MANS = scanimage.1 sane-config.1 sane-find-scanner.1 gamma4scanimage.1
+EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
+  gamma4scanimage.man
+
+# Create a list of man pages for only backends that are compiled in so
+# that is all that gets installed.  Also, build a complete list of all
+# backend man pages.  This allows a user to optionally generate all
+# man pages in HTML form for things like posting to a web site.
+#
+# Backend man pages bypass standard automake man5_MANS because there is not
+# a man page for every supported backend.  We could get rid of
+# custom install/uninstall if we required man pages for every backend.
+BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
+BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
+	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 \
+	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
+	sane-matsushita.5 sane-microtek.5 sane-microtek2.5 sane-mustek.5 \
+	sane-nec.5 sane-net.5 sane-pie.5 sane-pint.5 sane-pnm.5 \
+	sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 \
+	sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
+	sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
+	sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
+	sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5 \
+	sane-umax_pp.5 sane-umax1220u.5 sane-sm3600.5 sane-usb.5 \
+     	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
+        sane-teco1.5 sane-teco2.5 sane-teco3.5 sane-test.5 sane-sp15c.5 \
+	sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5 \
+	sane-ma1509.5 sane-ibm.5 sane-hp5400.5 sane-plustek_pp.5 sane-u12.5 \
+	sane-niash.5 sane-sm3840.5 sane-genesys.5 sane-hp4200.5 \
+	sane-mustek_usb2.5 sane-hp3500.5 sane-pixma.5 sane-stv680.5 \
+	sane-hp5590.5 sane-hpljm1005.5 sane-cardscan.5 sane-hp3900.5 \
+	sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5 sane-xerox_mfp.5 \
+	sane-rts8891.5 
+
+EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \
+	sane-dll.man sane-dc25.man sane-dmc.man sane-epson.man \
+	sane-epson2.man sane-hp.man sane-gphoto2.man sane-leo.man \
+	sane-lexmark.man sane-matsushita.man sane-microtek.man \
+	sane-microtek2.man sane-mustek.man sane-nec.man sane-net.man \
+	sane-pie.man sane-pint.man sane-pnm.man sane-umax.man \
+	sane-qcam.man sane-scsi.man sane-artec.man sane-fujitsu.man \
+	sane-sharp.man sane-s9036.man sane-tamarack.man \
+	sane-ricoh.man sane-avision.man sane-plustek.man sane-st400.man \
+	sane-mustek_pp.man sane-dc210.man sane-v4l.man sane-snapscan.man \
+	sane-canon.man sane-coolscan.man sane-bh.man sane-dc240.man \
+	sane-umax_pp.man sane-umax1220u.man sane-sm3600.man sane-usb.man \
+     	sane-mustek_usb.man sane-sceptre.man sane-canon_pp.man \
+	sane-canon630u.man sane-teco1.man sane-teco2.man \
+	sane-teco3.man sane-test.man sane-sp15c.man sane-coolscan2.man \
+	sane-hpsj5s.man sane-gt68xx.man sane-artec_eplus48u.man \
+	sane-ma1509.man sane-ibm.man sane-hp5400.man sane-plustek_pp.man \
+	sane-u12.man sane-niash.man sane-sm3840.man sane-genesys.man \
+	sane-hp4200.man sane-mustek_usb2.man sane-hp3500.man \
+	sane-pixma.man sane-stv680.man sane-hp5590.man sane-hpljm1005.man \
+	sane-cardscan.man sane-hp3900.man sane-epjitsu.man sane-hs2p.man \
+	sane-canon_dr.man sane-xerox_mfp.man sane-rts8891.man 
+
+man7_MANS = sane.7
+EXTRA_DIST += sane.man
+
+man8_MANS = saned.8
+EXTRA_DIST += saned.man
+
+MANPAGES = $(man1_MANS) $(BACKEND_5MANS) $(man7_MANS) $(man8_MANS)
+
+if CROSS_COMPILING
+HTML_PAGES =
+else
+HTML_PAGES = sane-backends.html sane-backends-external.html \
+	     sane-mfgs.html sane-mfgs-external.html
+endif
+doc_DATA = $(HTML_PAGES)
+
+if USE_LATEX
+STANDARD = sane.ps
+else
+STANDARD =
+endif
+
+all: bemans $(STANDARD) html-pages
+
+dist_doc_DATA = backend-writing.txt
+doc_DATA += $(STANDARD)
+EXTRA_DIST += descriptions.txt releases.txt sane-logo2.jpg sane-logo.png \
+  sane.png
+
+LATEX	= TEXINPUTS=$(srcdir):$$TEXINPUTS @LATEX@
+DVIPS   = @DVIPS@
+MAKEINDEX = @MAKEINDEX@
+DLH	= TEXINPUTS=$(srcdir):$$TEXINPUTS dlh
+MAN2HTML= nroff -man |\
+	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
+          -cgiurl '$$title.$$section.html'|\
+	  sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000><H1 ALIGN=CENTER><IMG SRC="/images/sane.png" HEIGHT=117 WIDTH=346></H1>,'
+
+%.1 %.5 %.7 %.8: %.man
+	@echo "Generating manpage $@...";
+	@sed -e 's|@DATADIR@|$(datadir)|g' \
+	  -e 's|@CONFIGDIR@|$(configdir)|g' \
+	  -e 's|@DOCDIR@|$(docdir)|g' \
+	  -e 's|@LIBDIR@|$(libdir)/sane|g' \
+	  -e 's|@BINDIR@|$(bindir)|g' \
+	  -e 's|@SBINDIR@|$(sbindir)|g' \
+	  -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@
+
+bemans: $(BACKEND_5MANS)
+
+beman5dir = $(mandir)/man5
+install-beman5: $(BACKEND_5MANS)
+	test -z "$(beman5dir)" || $(MKDIR_P) "$(DESTDIR)$(beman5dir)"
+	@list="$(BACKEND_MANS_ENABLED) sane-dll.5 sane-scsi.5 sane-usb.5"; for man in $$list; do \
+	  if test ! -r $${man}; then continue; fi; \
+	  echo "installing $${man} in $(beman5dir)/$${man}..."; \
+	  $(INSTALL_DATA) $${man} $(DESTDIR)$(beman5dir)/$${man} \
+	  || exit 1; \
+	done
+
+BEDOCS = canon/canon.changes canon/canon.install2700F.txt
+BEDOCS += gt68xx/gt68xx.CHANGES gt68xx/gt68xx.TODO
+BEDOCS += leo/leo.txt
+BEDOCS += matsushita/matsushita.txt
+BEDOCS += mustek/mustek.CHANGES
+BEDOCS += mustek_usb/mustek_usb.CHANGES mustek_usb/mustek_usb.TODO
+BEDOCS += mustek_usb2/mustek_usb2.CHANGES mustek_usb2/mustek_usb2.TODO
+BEDOCS += niash/niash.TODO
+BEDOCS += plustek/FAQ plustek/MakeModule.sh plustek/Makefile.kernel24 \
+  plustek/Makefile.kernel26 plustek/Plustek-PARPORT-TODO.txt \
+  plustek/Plustek-PARPORT.changes plustek/Plustek-PARPORT.txt \
+  plustek/Plustek-USB-TODO.txt plustek/Plustek-USB.changes \
+  plustek/Plustek-USB.txt
+BEDOCS += sceptre/s1200.txt
+BEDOCS += teco/teco1.txt teco/teco2.txt teco/teco3.txt
+BEDOCS += u12/U12.changes u12/U12.todo
+BEDOCS += umax/negative-types.txt umax/sane-logo.jpg \
+  umax/sane-umax-advanced-options-doc.html \
+  umax/sane-umax-advanced.jpg umax/sane-umax-astra-doc.html \
+  umax/sane-umax-config-doc.html umax/sane-umax-doc.html \
+  umax/sane-umax-histogram.jpg umax/sane-umax-mirage-doc.html \
+  umax/sane-umax-not-listed-doc.html umax/sane-umax-others-doc.html \
+  umax/sane-umax-parport-doc.html umax/sane-umax-powerlook-doc.html \
+  umax/sane-umax-scanner-clones-doc.html umax/sane-umax-speed-doc.html \
+  umax/sane-umax-standard-options-doc.html \
+  umax/sane-umax-standard.jpg umax/sane-umax-text.jpg \
+  umax/sane-umax-text2.jpg umax/sane-umax-text4.jpg \
+  umax/sane-umax-uc-doc.html umax/sane-umax-vista-doc.html \
+  umax/sane-umax.jpg umax/umax.BUGS umax/umax.CHANGES umax/umax.FAQ \
+  umax/umax.TODO
+
+EXTRA_DIST += $(BEDOCS) sane.tex net.tex html.sty
+
+install-bedocs: $(BEDOCS)
+	@list='$(BEDOCS)'; \
+	  doc_files=`for file in $$list; do echo $$file; done`; \
+	  case $$doc_files in \
+	  */*) $(MKDIR_P) `echo "$$doc_files" | \
+	  sed 's|^|$(DESTDIR)$(docdir)/|;s,/[^/]*$$,,' | \
+	  sort -u` ; \
+	  esac; \
+	  for doc in $$doc_files; do \
+	  echo "installing $(srcdir)/$${doc} in $(docdir)/$${doc}..."; \
+	  $(INSTALL_DATA) $(srcdir)/$${doc} $(DESTDIR)$(docdir)/$${doc} \
+	  || exit 1; \
+	  done
+
+EXTRA_DIST += descriptions/abaton.desc descriptions/agfafocus.desc \
+  descriptions/apple.desc descriptions/artec.desc \
+  descriptions/artec_eplus48u.desc descriptions/as6e.desc \
+  descriptions/avision.desc descriptions/bh.desc descriptions/canon630u.desc \
+  descriptions/canon.desc descriptions/canon_dr.desc \
+  descriptions/canon_pp.desc descriptions/cardscan.desc \
+  descriptions/coolscan2.desc descriptions/coolscan.desc \
+  descriptions/dc210.desc descriptions/dc240.desc descriptions/dc25.desc \
+  descriptions/dell1600n_net.desc descriptions/dll.desc descriptions/dmc.desc \
+  descriptions/epjitsu.desc descriptions/epson2.desc descriptions/epson.desc \
+  descriptions/fujitsu.desc descriptions/genesys.desc \
+  descriptions/gphoto2.desc descriptions/gt68xx.desc descriptions/hp3500.desc \
+  descriptions/hp3900.desc descriptions/hp4200.desc descriptions/hp5400.desc \
+  descriptions/hp5590.desc descriptions/hp.desc descriptions/hpljm1005.desc \
+  descriptions/hpsj5s.desc descriptions/hs2p.desc descriptions/ibm.desc \
+  descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \
+  descriptions/matsushita.desc descriptions/microtek2.desc \
+  descriptions/microtek.desc descriptions/mustek.desc \
+  descriptions/mustek_pp.desc descriptions/mustek_usb2.desc \
+  descriptions/mustek_usb.desc descriptions/nec.desc descriptions/net.desc \
+  descriptions/niash.desc descriptions/pie.desc descriptions/pint.desc \
+  descriptions/pixma.desc descriptions/plustek.desc \
+  descriptions/plustek_pp.desc descriptions/pnm.desc descriptions/qcam.desc \
+  descriptions/ricoh.desc descriptions/rts8891.desc descriptions/s9036.desc \
+  descriptions/sceptre.desc descriptions/sharp.desc descriptions/sm3600.desc \
+  descriptions/sm3840.desc descriptions/snapscan.desc descriptions/sp15c.desc \
+  descriptions/st400.desc descriptions/stv680.desc descriptions/tamarack.desc \
+  descriptions/teco1.desc descriptions/teco2.desc descriptions/teco3.desc \
+  descriptions/template.desc. descriptions/test.desc descriptions/u12.desc \
+  descriptions/umax1220u.desc descriptions/umax.desc \
+  descriptions/umax_pp.desc  descriptions/unsupported.desc \
+  descriptions/v4l.desc descriptions/xerox_mfp.desc
+
+EXTRA_DIST += descriptions-external/brother2.desc \
+  descriptions-external/brother.desc \
+  descriptions-external/brother-mfc4600.desc \
+  descriptions-external/canon_mfp.desc \
+  descriptions-external/cs3200f.desc \
+  descriptions-external/epkowa.desc \
+  descriptions-external/geniusvp2.desc \
+  descriptions-external/hp3770.desc \
+  descriptions-external/hp8200.desc \
+  descriptions-external/hpaio.desc \
+  descriptions-external/hpoj.desc \
+  descriptions-external/lhii.desc \
+  descriptions-external/mustek_a3p1.desc \
+  descriptions-external/primascan.desc \
+  descriptions-external/primax.desc \
+  descriptions-external/samsung.desc \
+  descriptions-external/scanwit.desc \
+  descriptions-external/template.desc. \
+  descriptions-external/v4l2.desc \
+  descriptions-external/viceo.desc
+
+EXTRA_DIST += figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
+  figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
+  figs/image-data.fig figs/xfer.eps figs/xfer.fig
+
+EXTRA_DIST += icons/contents.gif icons/index.gif icons/next.gif \
+  icons/next_gr.gif icons/previous.gif icons/previous_gr.gif \
+  icons/references.gif icons/references_gr.gif icons/up.gif icons/up_gr.gif
+
+install-data-local: install-beman5 install-bedocs
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(docdir)
+	rm -rf $(DESTDIR)$(beman5dir)/sane-*.5
+
+sane.ind: $(srcdir)/sane.tex
+	@echo Generating index for sane.tex...
+	@touch sane.ind
+	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null && \
+	  $(MAKEINDEX) sane.idx 2>/dev/null && \
+	  $(LATEX) $(srcdir)/sane </dev/null >/dev/null
+
+sane.dvi: sane.ind
+	@echo Generating sane.dvi from sane.tex...
+	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null
+
+sane.ps: sane.dvi
+	@echo Generating sane.ps from sane.dvi...
+	@$(DVIPS) sane.dvi -o sane.ps 2>/dev/null
+
+sane-html: sane.dvi
+	$(DLH) $(srcdir)/sane.tex
+
+html-man: $(MANPAGES)
+	@for page in $(MANPAGES); do \
+	  echo "translating $${page} to $${page}.html..."; \
+	  cat $${page} | $(MAN2HTML) > $${page}.html; \
+	done
+
+../tools/sane-desc:
+	cd ../tools ; $(MAKE) sane-desc
+
+sane-backends.html: $(wildcard descriptions/*.desc) ../tools/sane-desc
+	@../tools/sane-desc -m html-backends-split -s ${srcdir}/descriptions \
+	  -i "The following table summarizes the backends/drivers distributed \
+	  with $(PACKAGE)-$(VERSION), and the hardware or software they \
+	  support." -d 0 > sane-backends.html
+
+sane-backends-external.html: $(wildcard descriptions-external/*.desc) \
+                             ../tools/sane-desc
+	@../tools/sane-desc -m html-backends-split \
+	  -s ${srcdir}/descriptions-external \
+	  -i "The following table summarizes the backends/drivers that \
+	  have not yet been included in the SANE distribution, and the \
+	  hardware or software they support." \
+	  -t "SANE: External Backends (Drivers)" -d 0 \
+	  > sane-backends-external.html
+
+sane-mfgs.html: $(wildcard descriptions/*.desc) ../tools/sane-desc
+	@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions \
+	  -i "The following table summarizes the devices supported \
+	  by $(PACKAGE)-$(VERSION)." \
+	  -d 0 > sane-mfgs.html
+
+sane-mfgs-external.html: $(wildcard descriptions-external/*.desc) \
+                             ../tools/sane-desc
+	@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions-external \
+	  -i "The following table summarizes the devices that \
+	  are supported by external backends." \
+	  -t "SANE: Devices Supported by External Backends" -d 0 \
+	  > sane-mfgs-external.html
+
+html-pages: $(HTML_PAGES)
+html: html-pages html-man sane-html
+
+clean-local:
+	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
+	rm -f *.ilg
+
+distclean-local:
+	rm -f $(MANPAGES)
+	rm -f *.lot *.lof *.ind
+	rm -f sane.dvi sane.ps sane-backends.html sane-backends-external.html
+	rm -f sane-mfgs.html sane-mfgs-external.html
+	rm -f sane/*.html sane/*.gif
+	rm -f doxygen-sanei.conf
+	-rm -rf sane sanei-html
+	for manpage in $(MANPAGES) ; do \
+	  rm -f $${manpage}.html ; \
+	done
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -82,6 +82,7 @@ AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
 BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
+BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@ -95,7 +96,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPEND_RECURSIVE = @DEPEND_RECURSIVE@
 DISTCLEAN_FILES = @DISTCLEAN_FILES@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
@ -136,7 +136,6 @@ LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAKEDEPEND = @MAKEDEPEND@
 MAKEINDEX = @MAKEINDEX@
 MAKEINFO = @MAKEINFO@
 MATH_LIB = @MATH_LIB@
@ -174,7 +173,6 @@ STRIP = @STRIP@
 SYSLOG_LIBS = @SYSLOG_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
 USB_LIBS = @USB_LIBS@
-USE_LATEX = @USE_LATEX@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@