- 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
This commit is contained in:
frankmorgner
2011-10-29 22:29:15 +00:00
parent 5c43514e68
commit f52e9054e1
14 changed files with 24 additions and 41 deletions

View File

@@ -1,5 +1,2 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src m4 patches doc
doc :
$(MAKE) doc -C $(srcdir)/doc

View File

@@ -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])

View File

@@ -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

View File

@@ -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

View File

@@ -44,6 +44,3 @@ Download
You can download the latest release of vsmartcard `here <https://sourceforge.net/projects/vsmartcard/files/vsmartcard_2011-05-20.tar.gz/download>`_.
Alternatively you can check out the source code from our `subversion repository <https://sourceforge.net/projects/vsmartcard/develop>`_.
.. include:: questions.rst.in

View File

@@ -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
<http://sourceforge.net/projects/vsmartcard/support>`_.
more than welcome! Please use our `project trackers <@PACKAGE_BUGREPORT@>`_.

View File

@@ -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:

View File

@@ -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])

View File

@@ -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

View File

@@ -1,4 +1 @@
SUBDIRS = src doc
doc :
$(MAKE) doc -C $(srcdir)/doc

View File

@@ -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

View File

@@ -1,4 +1 @@
SUBDIRS = src doc
doc:
$(MAKE) doc -C $(srcdir)/doc

View File

@@ -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])

View File

@@ -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