From d4b270657a5bac0aa4f027d37e40bd910324aa60 Mon Sep 17 00:00:00 2001
From: frankmorgner <frankmorgner@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Sat, 5 Nov 2011 17:01:36 +0000
Subject: [PATCH] cleaned up build of documentation

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@625 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 ccid/doc/Makefile.am             |  2 +-
 npa/configure.ac                 | 15 ---------------
 npa/doc/Makefile.am              |  4 +++-
 pcsc-relay/doc/Makefile.am       |  2 +-
 virtualsmartcard/configure.ac    | 11 -----------
 virtualsmartcard/doc/Makefile.am |  2 +-
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/ccid/doc/Makefile.am b/ccid/doc/Makefile.am
index 3d4fdb3..f68c59d 100644
--- a/ccid/doc/Makefile.am
+++ b/ccid/doc/Makefile.am
@@ -22,4 +22,4 @@ doc: *.in
 	touch doc
 
 clean-local:
-	rm -f doc README.rst autotools.rst questions.rst
+	rm -f doc
diff --git a/npa/configure.ac b/npa/configure.ac
index 41175d3..7a8b32b 100644
--- a/npa/configure.ac
+++ b/npa/configure.ac
@@ -53,19 +53,6 @@ LIBS="$saved_LIBS"
 AC_DEFINE(BUERGERCLIENT_WORKAROUND, 1, [Always get EF.CardAccess, when connecting to a smart card. This is a workaround for the recent Buergerclient])
 
 
-# Documentation (default: no)
-AC_ARG_ENABLE([doc],AS_HELP_STRING([--enable-doc],[Enable documentation generation.]),[enable_doc=$enableval],[enable_doc="no"])
-if test x"$enable_doc" = "xyes"
-then
-    AC_PATH_PROG([DOXYGEN], [doxygen])
-    if test x$DOXYGEN = x
-    then
-        AC_MSG_ERROR([doxygen is mandatory.])
-    fi
-fi
-AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
-
-
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h memory.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h])
 
@@ -103,8 +90,6 @@ OPENSC_LIBS:          ${OPENSC_LIBS}
 OPENSSL_CFLAGS:       ${OPENSSL_CFLAGS}
 OPENSSL_LIBS:         ${OPENSSL_LIBS}
 
-Documentation:        ${enable_doc}
-
 EOF
 
 AC_CONFIG_FILES([
diff --git a/npa/doc/Makefile.am b/npa/doc/Makefile.am
index 0547d33..43d8fcc 100644
--- a/npa/doc/Makefile.am
+++ b/npa/doc/Makefile.am
@@ -1,3 +1,5 @@
+DOXYGEN ?= doxygen
+
 do_subst = sed \
 	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
 	   -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \
@@ -25,4 +27,4 @@ doc: $(top_srcdir)/src/npa/*.h *.in
 	touch doc
 
 clean-local:
-	rm -f doc README.rst autotools.rst questions.rst Doxyfile
+	rm -f doc Doxyfile
diff --git a/pcsc-relay/doc/Makefile.am b/pcsc-relay/doc/Makefile.am
index 66638bd..7e0ef8a 100644
--- a/pcsc-relay/doc/Makefile.am
+++ b/pcsc-relay/doc/Makefile.am
@@ -22,4 +22,4 @@ doc: *.in
 	touch doc
 
 clean-local:
-	rm -f doc README.rst autotools.rst questions.rst
+	rm -f doc
diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
index c3c1153..635298e 100644
--- a/virtualsmartcard/configure.ac
+++ b/virtualsmartcard/configure.ac
@@ -53,17 +53,6 @@ if test "${serialdropdir}" = false ; then
 	fi
 fi
 
-# Documentation (default: no)
-AC_ARG_ENABLE([doc],AS_HELP_STRING([--enable-doc],[Enable documentation generation.]),[enable_doc=$enableval],[enable_doc="no"])
-if test x"$enable_doc" = "xyes"
-then
-    AC_PATH_PROG([DOXYGEN], [doxygen])
-    if test x$DOXYGEN = x
-    then
-        AC_MSG_ERROR([doxygen is mandatory.])
-    fi
-fi
-AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
diff --git a/virtualsmartcard/doc/Makefile.am b/virtualsmartcard/doc/Makefile.am
index 5ccc93b..0fde5df 100644
--- a/virtualsmartcard/doc/Makefile.am
+++ b/virtualsmartcard/doc/Makefile.am
@@ -27,4 +27,4 @@ doc: $(top_srcdir)/src/vpicc/virtualsmartcard/*.py $(top_srcdir)/src/vpicc/virtu
 	touch doc
 
 clean-local:
-	rm -f doc README.rst autotools.rst questions.rst
+	rm -f doc