From f52e9054e1fde221a3d4b79159bbb7762d5d1ea7 Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Sat, 29 Oct 2011 22:29:15 +0000 Subject: [PATCH] - more autotool magic in documentation files - including substituted documentation files with distributed files git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@597 96b47cad-a561-4643-ad3b-153ac7d7599c --- ccid/Makefile.am | 3 --- ccid/configure.ac | 2 +- ccid/doc/Makefile.am | 8 ++++---- doc/autotools.rst.in | 8 ++++---- doc/index.rst | 3 --- doc/questions.rst.in | 4 +--- npa/Makefile.am | 3 --- npa/configure.ac | 2 +- npa/doc/Makefile.am | 8 ++++---- pcsc-relay/Makefile.am | 3 --- pcsc-relay/doc/Makefile.am | 8 ++++---- virtualsmartcard/Makefile.am | 3 --- virtualsmartcard/configure.ac | 2 +- virtualsmartcard/doc/Makefile.am | 8 ++++---- 14 files changed, 24 insertions(+), 41 deletions(-) diff --git a/ccid/Makefile.am b/ccid/Makefile.am index 10650bf..3847151 100644 --- a/ccid/Makefile.am +++ b/ccid/Makefile.am @@ -1,5 +1,2 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src m4 patches doc - -doc : - $(MAKE) doc -C $(srcdir)/doc diff --git a/ccid/configure.ac b/ccid/configure.ac index 7a5562c..766ff29 100644 --- a/ccid/configure.ac +++ b/ccid/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([ccid-emulator], [0.6], [http://sourceforge.net/projects/vsmartcard/support]) +AC_INIT([CCID Emulator], [0.6], [http://sourceforge.net/projects/vsmartcard/support], [ccid-emulator], [http://sourceforge.net/projects/vsmartcard/]) AC_CONFIG_SRCDIR([src/ccid.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/ccid/doc/Makefile.am b/ccid/doc/Makefile.am index 1db42a3..c63bb07 100644 --- a/ccid/doc/Makefile.am +++ b/ccid/doc/Makefile.am @@ -1,5 +1,8 @@ do_subst = sed \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ + -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ + -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ @@ -10,12 +13,9 @@ do_subst = sed \ -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \ -e 's,[@]top_srcdir[@],$(top_srcdir),g' -EXTRA_DIST = README.rst autotools.rst.in questions.rst.in +EXTRA_DIST = README.rst autotools.rst autotools.rst.in questions.rst questions.rst.in .PHONY: doc doc: $(do_subst) < autotools.rst.in > autotools.rst $(do_subst) < questions.rst.in > questions.rst - -clean-local: - rm -f autotools.rst questions.rst diff --git a/doc/autotools.rst.in b/doc/autotools.rst.in index c918f61..4469774 100644 --- a/doc/autotools.rst.in +++ b/doc/autotools.rst.in @@ -4,16 +4,16 @@ Installation ============= -@PACKAGE_NAME@ uses the GNU Build System to compile and install. If you are +The @PACKAGE_NAME@ uses the GNU Build System to compile and install. If you are unfamiliar with it, please have a look at :file:`INSTALL`. If you have a look around and can not find it, you are probably working bleeding edge in the -repository. Run the following command in the @PACKAGE_NAME@ directory to get -the missing standard auxiliary files:: +repository. Run the following command in the @PACKAGE_TARNAME@ directory to +get the missing standard auxiliary files:: autoreconf -i To configure (:command:`configure --help` lists possible options), build and -install @PACKAGE_NAME@ now do the following:: +install the @PACKAGE_NAME@ now do the following:: ./configure make diff --git a/doc/index.rst b/doc/index.rst index 7e24b66..846d7ff 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -44,6 +44,3 @@ Download You can download the latest release of vsmartcard `here `_. Alternatively you can check out the source code from our `subversion repository `_. - - -.. include:: questions.rst.in diff --git a/doc/questions.rst.in b/doc/questions.rst.in index da8368d..e95d912 100644 --- a/doc/questions.rst.in +++ b/doc/questions.rst.in @@ -3,6 +3,4 @@ Question ======== Do you have questions, suggestions or contributions? Feedback of any kind is -more than welcome! Please use our `project trackers -`_. - +more than welcome! Please use our `project trackers <@PACKAGE_BUGREPORT@>`_. diff --git a/npa/Makefile.am b/npa/Makefile.am index ce2bb50..7d8a6d2 100644 --- a/npa/Makefile.am +++ b/npa/Makefile.am @@ -21,9 +21,6 @@ win: ./configure --disable-doc && \ env OPENSSL_VERSION="1" OPENSSL_URL="https://www2.informatik.hu-berlin.de/~morgner/files/openssl-1.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" win32/installer_from_build.sh -doc : - $(MAKE) doc -C $(srcdir)/doc - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnpa.pc libnpa.pc: diff --git a/npa/configure.ac b/npa/configure.ac index b3de8a8..41175d3 100644 --- a/npa/configure.ac +++ b/npa/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([npa], [0.4], [http://sourceforge.net/projects/vsmartcard/support]) +AC_INIT([nPA smart card library], [0.4], [http://sourceforge.net/projects/vsmartcard/support], [npa], [http://sourceforge.net/projects/vsmartcard/]) AC_CONFIG_SRCDIR([src/npa.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/npa/doc/Makefile.am b/npa/doc/Makefile.am index 4fe393c..15d4641 100644 --- a/npa/doc/Makefile.am +++ b/npa/doc/Makefile.am @@ -1,5 +1,8 @@ do_subst = sed \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ + -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ + -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ @@ -10,7 +13,7 @@ do_subst = sed \ -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \ -e 's,[@]top_srcdir[@],$(top_srcdir),g' -EXTRA_DIST = README.rst Doxyfile.in example.c autotools.rst.in questions.rst.in +EXTRA_DIST = README.rst Doxyfile.in example.c autotools.rst autotools.rst.in questions.rst questions.rst.in .PHONY: doc doc: @@ -19,6 +22,3 @@ doc: touch api.rst $(do_subst) < autotools.rst.in > autotools.rst $(do_subst) < questions.rst.in > questions.rst - -clean-local: - rm -f Doxyfile autotools.rst questions.rst diff --git a/pcsc-relay/Makefile.am b/pcsc-relay/Makefile.am index 67ef6bf..3920780 100644 --- a/pcsc-relay/Makefile.am +++ b/pcsc-relay/Makefile.am @@ -1,4 +1 @@ SUBDIRS = src doc - -doc : - $(MAKE) doc -C $(srcdir)/doc diff --git a/pcsc-relay/doc/Makefile.am b/pcsc-relay/doc/Makefile.am index 1db42a3..34da66b 100644 --- a/pcsc-relay/doc/Makefile.am +++ b/pcsc-relay/doc/Makefile.am @@ -1,5 +1,8 @@ do_subst = sed \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ + -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ + -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ @@ -10,12 +13,9 @@ do_subst = sed \ -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \ -e 's,[@]top_srcdir[@],$(top_srcdir),g' -EXTRA_DIST = README.rst autotools.rst.in questions.rst.in +EXTRA_DIST = README.rst autotools.rst.in questions.rst.in autotools.rst questions.rst .PHONY: doc doc: $(do_subst) < autotools.rst.in > autotools.rst $(do_subst) < questions.rst.in > questions.rst - -clean-local: - rm -f autotools.rst questions.rst diff --git a/virtualsmartcard/Makefile.am b/virtualsmartcard/Makefile.am index bfe12bc..3920780 100644 --- a/virtualsmartcard/Makefile.am +++ b/virtualsmartcard/Makefile.am @@ -1,4 +1 @@ SUBDIRS = src doc - -doc: - $(MAKE) doc -C $(srcdir)/doc diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac index 85f3e5a..b6e0a2d 100644 --- a/virtualsmartcard/configure.ac +++ b/virtualsmartcard/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([virtualsmartcard], [0.5], [http://sourceforge.net/projects/vsmartcard/support]) +AC_INIT([Virtual Smart Card], [0.5], [http://sourceforge.net/projects/vsmartcard/support], [virtualsmartcard], [http://sourceforge.net/projects/vsmartcard/]) AC_CONFIG_SRCDIR([src/vpcd/ifd-vpcd.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/virtualsmartcard/doc/Makefile.am b/virtualsmartcard/doc/Makefile.am index b6a96b6..218edd7 100644 --- a/virtualsmartcard/doc/Makefile.am +++ b/virtualsmartcard/doc/Makefile.am @@ -2,6 +2,9 @@ SUBDIRS = api do_subst = sed \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ + -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ + -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ @@ -12,7 +15,7 @@ do_subst = sed \ -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \ -e 's,[@]top_srcdir[@],$(top_srcdir),g' -EXTRA_DIST = README.rst autotools.rst.in questions.rst.in +EXTRA_DIST = README.rst autotools.rst.in questions.rst.in autotools.rst questions.rst dist_noinst_SCRIPTS = generate_modules.py @@ -21,6 +24,3 @@ doc: $(do_subst) < autotools.rst.in > autotools.rst $(do_subst) < questions.rst.in > questions.rst ./generate_modules.py $(top_srcdir)/src/vpicc --dest-dir=api --suffix=rst --no-toc -1 - -clean-local: - rm -rf api/* autotools.rst questions.rst