included help output from programs in documentation

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@627 96b47cad-a561-4643-ad3b-153ac7d7599c

ccid/doc/Makefile.am

@@ -11,6 +11,7 @@ do_subst = sed \
 	   -e 's,[@]includedir[@],$(includedir),g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
+	   -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 EXTRA_DIST = README.rst.in README.rst autotools.rst autotools.rst.in questions.rst questions.rst.in

ccid/doc/README.rst

@@ -109,9 +109,13 @@ mounted.  The CCID Emulator is compatible with the unix driver libccid_ and the
 windows smart card driver. To initialize PACE using the PC/SC API you need to
 patch libccid and pcsc-lite (see directory patches).
 
+.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/ccid/src && ./ccid-emulator --help'
+
 cats-test can be used to test the PACE capabilities of a smart card reader with
 PACE support (such as the CCID Emulator or any other "Standardleser" CAT-S or
 "Komfortleser" CAT-C) via PC/SC.
 
+.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/ccid/src && ./cats-test'
+
 
 .. include:: questions.rst

ccid/doc/README.rst.in

@@ -109,9 +109,13 @@ mounted.  The @PACKAGE_NAME@ is compatible with the unix driver libccid_ and the
 windows smart card driver. To initialize PACE using the PC/SC API you need to
 patch libccid and pcsc-lite (see directory patches).
 
+.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./ccid-emulator --help'
+
 cats-test can be used to test the PACE capabilities of a smart card reader with
 PACE support (such as the @PACKAGE_NAME@ or any other "Standardleser" CAT-S or
 "Komfortleser" CAT-C) via PC/SC.
 
+.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./cats-test'
+
 
 .. include:: questions.rst

doc/conf.py

@@ -31,7 +31,7 @@ needs_sphinx = '1.1'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ["breathe", "sphinxcontrib.doxylink", "sphinx.ext.autosummary"]
+extensions = ["breathe", "sphinxcontrib.doxylink", "sphinx.ext.autosummary", "sphinxcontrib.programoutput"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

npa/configure.ac

@@ -8,13 +8,23 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 
+dnl Add libtool support.
+ifdef(
+	[LT_INIT],
+	[
+		LT_INIT([win32-dll])
+	],
+	[
+		AC_LIBTOOL_WIN32_DLL
+		AC_PROG_LIBTOOL
+	]
+)
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_LIBTOOL
-LT_INIT
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 

npa/doc/Makefile.am

@@ -13,6 +13,7 @@ do_subst = sed \
 	   -e 's,[@]includedir[@],$(includedir),g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
+	   -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 EXTRA_DIST = README.rst.in README.rst Doxyfile.in example.c autotools.rst autotools.rst.in questions.rst questions.rst.in

npa/doc/README.rst

@@ -109,6 +109,8 @@ To pass a secret to npa-tool, the command line parameters or the environment
 variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used,
 npa-tool will show a password prompt.
 
+.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/npa/src && ./npa-tool --help'
+
 ----------------------
 Linking against libnpa
 ----------------------

npa/doc/README.rst.in

@@ -109,6 +109,8 @@ To pass a secret to npa-tool, the command line parameters or the environment
 variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used,
 npa-tool will show a password prompt.
 
+.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./npa-tool --help'
+
 ----------------------
 Linking against libnpa
 ----------------------

pcsc-relay/doc/Makefile.am

@@ -11,6 +11,7 @@ do_subst = sed \
 	   -e 's,[@]includedir[@],$(includedir),g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
+	   -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 EXTRA_DIST = README.rst.in README.rst autotools.rst.in questions.rst.in autotools.rst questions.rst

pcsc-relay/doc/README.rst

@@ -32,6 +32,8 @@ pcsc-relay has the following dependencies:
 - PC/SC middleware
 - libnfc_
 
+.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/pcsc-relay/src && ./pcsc-relay --help'
+
 
 ---------------
 Hints on libnfc

pcsc-relay/doc/README.rst.in

@@ -32,6 +32,8 @@ pcsc-relay has the following dependencies:
 - PC/SC middleware
 - libnfc_
 
+.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./pcsc-relay --help'
+
 
 ---------------
 Hints on libnfc

virtualsmartcard/doc/Makefile.am

@@ -13,6 +13,7 @@ do_subst = sed \
 	   -e 's,[@]includedir[@],$(includedir),g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
+	   -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 EXTRA_DIST = README.rst.in README.rst autotools.rst.in questions.rst.in autotools.rst questions.rst

virtualsmartcard/doc/README.rst

@@ -73,5 +73,7 @@ You should now be able to access the |vpicc| through the system's
 PC/SC API via |vpcd|/pcscd. You can use the opensc-explorer or pcsc_scan to test
 that.
 
+.. program-output:: /home/fm/work/vsmartcard/virtualsmartcard/src/vpicc/vicc --help
+
 
 .. include:: questions.rst

virtualsmartcard/doc/README.rst.in

@@ -73,5 +73,7 @@ You should now be able to access the |vpicc| through the system's
 PC/SC API via |vpcd|/pcscd. You can use the opensc-explorer or pcsc_scan to test
 that.
 
+.. program-output:: @abs_top_srcdir@/src/vpicc/vicc --help
+
 
 .. include:: questions.rst