diff --git a/ccid/Makefile.am b/ccid/Makefile.am index 4bc268c..3847151 100644 --- a/ccid/Makefile.am +++ b/ccid/Makefile.am @@ -1,15 +1,2 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src m4 patches - -EXTRA_DIST = README.dox apdus - -do_subst = sed \ - -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ - -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ - -e 's,[@]builddir[@],$(builddir),g' \ - -e 's,[@]prefix[@],$(prefix),g' \ - -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ - -e 's,[@]libdir[@],$(libdir),g' \ - -e 's,[@]includedir[@],$(includedir),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]top_srcdir[@],$(top_srcdir),g' +SUBDIRS = src m4 patches doc diff --git a/ccid/README b/ccid/README index 68c0c3b..2ad76b7 120000 --- a/ccid/README +++ b/ccid/README @@ -1 +1 @@ -README.dox \ No newline at end of file +doc/README.rst \ No newline at end of file diff --git a/ccid/configure.ac b/ccid/configure.ac index c834c19..7a5562c 100644 --- a/ccid/configure.ac +++ b/ccid/configure.ac @@ -188,5 +188,6 @@ AC_CONFIG_FILES([ m4/Makefile patches/Makefile src/Makefile + doc/Makefile ]) AC_OUTPUT diff --git a/ccid/doc/Makefile.am b/ccid/doc/Makefile.am new file mode 100644 index 0000000..aa044b3 --- /dev/null +++ b/ccid/doc/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = README.rst diff --git a/ccid/README.dox b/ccid/doc/README.rst similarity index 100% rename from ccid/README.dox rename to ccid/doc/README.rst diff --git a/doc/_static/doxygen-npa b/doc/_static/doxygen-npa index c16440d..ee61305 120000 --- a/doc/_static/doxygen-npa +++ b/doc/_static/doxygen-npa @@ -1 +1 @@ -../doxygen/npa/html \ No newline at end of file +../npa/html \ No newline at end of file diff --git a/doc/ccid b/doc/ccid new file mode 120000 index 0000000..5be4845 --- /dev/null +++ b/doc/ccid @@ -0,0 +1 @@ +../ccid/doc \ No newline at end of file diff --git a/doc/ccid.rst b/doc/ccid.rst deleted file mode 120000 index a8f0870..0000000 --- a/doc/ccid.rst +++ /dev/null @@ -1 +0,0 @@ -../ccid/README \ No newline at end of file diff --git a/doc/conf.py b/doc/conf.py index 1a34c1c..d301c0f 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -216,7 +216,7 @@ man_pages = [ [u'Dominik Oepen, Frank Morgner'], 1) ] -os.system("make doc -C ../npa/ >/dev/null && touch npaapi.rst") -breathe_projects = {"npa": "doxygen/npa/xml"} +os.system("cd npa && make doc >/dev/null && touch api.rst") +breathe_projects = {"npa": "npa/xml"} breathe_default_project = "npa" -doxylink = { 'npa' : ('doxygen/npa/npa.tag', '_static/doxygen-npa/'), } +doxylink = { 'npa' : ('npa/npa.tag', '_static/doxygen-npa/'), } diff --git a/doc/doxygen/npa b/doc/doxygen/npa deleted file mode 120000 index 0e9eede..0000000 --- a/doc/doxygen/npa +++ /dev/null @@ -1 +0,0 @@ -../../npa/doc/ \ No newline at end of file diff --git a/doc/index.rst b/doc/index.rst index 3785f37..7cb7e4a 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -12,10 +12,10 @@ Currently the following projects are part of vsmartcard: .. toctree:: - virtualsmartcard - pcsc-relay - npa - ccid + virtualsmartcard/README + pcsc-relay/README + npa/README + ccid/README Looking for a feature the included programs do not offer? Want to extend the functionality of some library? Apart from requesting a new feature, you can @@ -23,7 +23,7 @@ have a look at these programming guides and try yourself: .. toctree:: - npaapi + npa/api Download ======== diff --git a/doc/npa b/doc/npa new file mode 120000 index 0000000..c8c8928 --- /dev/null +++ b/doc/npa @@ -0,0 +1 @@ +../npa/doc \ No newline at end of file diff --git a/doc/npa.rst b/doc/npa.rst deleted file mode 120000 index 0cd22b6..0000000 --- a/doc/npa.rst +++ /dev/null @@ -1 +0,0 @@ -../npa/README \ No newline at end of file diff --git a/doc/pcsc-relay b/doc/pcsc-relay new file mode 120000 index 0000000..1021aa8 --- /dev/null +++ b/doc/pcsc-relay @@ -0,0 +1 @@ +../pcsc-relay/doc \ No newline at end of file diff --git a/doc/pcsc-relay.rst b/doc/pcsc-relay.rst deleted file mode 120000 index 40759ab..0000000 --- a/doc/pcsc-relay.rst +++ /dev/null @@ -1 +0,0 @@ -../pcsc-relay/README \ No newline at end of file diff --git a/doc/virtualsmartcard b/doc/virtualsmartcard new file mode 120000 index 0000000..55aff21 --- /dev/null +++ b/doc/virtualsmartcard @@ -0,0 +1 @@ +../virtualsmartcard/doc \ No newline at end of file diff --git a/doc/virtualsmartcard.rst b/doc/virtualsmartcard.rst deleted file mode 120000 index 9a856c6..0000000 --- a/doc/virtualsmartcard.rst +++ /dev/null @@ -1 +0,0 @@ -../virtualsmartcard/README \ No newline at end of file diff --git a/npa/Makefile.am b/npa/Makefile.am index 4889ac0..119d0f5 100644 --- a/npa/Makefile.am +++ b/npa/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src m4 +SUBDIRS = src m4 doc -EXTRA_DIST = README.dox libnpa.pc.in Doxyfile.in apdus +EXTRA_DIST = libnpa.pc.in apdus do_subst = sed \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ @@ -24,8 +24,7 @@ win: if DOC_ENABLED .PHONY: doc doc : - $(do_subst) < $(srcdir)/Doxyfile.in > Doxyfile - $(DOXYGEN) Doxyfile + $(MAKE) doc -C doc endif pkgconfigdir = $(libdir)/pkgconfig @@ -34,4 +33,4 @@ libnpa.pc: $(do_subst) < $(srcdir)/libnpa.pc.in > libnpa.pc clean-local: - rm -rf doc Doxyfile libnpa.pc + rm -f libnpa.pc diff --git a/npa/README b/npa/README index 68c0c3b..2ad76b7 120000 --- a/npa/README +++ b/npa/README @@ -1 +1 @@ -README.dox \ No newline at end of file +doc/README.rst \ No newline at end of file diff --git a/npa/configure.ac b/npa/configure.ac index 94f4ff1..b3de8a8 100644 --- a/npa/configure.ac +++ b/npa/configure.ac @@ -111,5 +111,6 @@ AC_CONFIG_FILES([ Makefile m4/Makefile src/Makefile + doc/Makefile ]) AC_OUTPUT diff --git a/npa/Doxyfile.in b/npa/doc/Doxyfile.in similarity index 77% rename from npa/Doxyfile.in rename to npa/doc/Doxyfile.in index 7703b7f..28a331b 100644 --- a/npa/Doxyfile.in +++ b/npa/doc/Doxyfile.in @@ -1,11 +1,11 @@ FILE_PATTERNS = *.h GENERATE_HTML = YES GENERATE_LATEX = NO -GENERATE_TAGFILE = @builddir@/doc/@PACKAGE_NAME@.tag +GENERATE_TAGFILE = @builddir@/@PACKAGE_NAME@.tag GENERATE_XML = YES INPUT = @top_srcdir@/src/npa OPTIMIZE_OUTPUT_FOR_C = YES -OUTPUT_DIRECTORY = @builddir@/doc +OUTPUT_DIRECTORY = @builddir@ PROJECT_NAME = @PACKAGE_NAME@ PROJECT_NUMBER = @PACKAGE_VERSION@ STRIP_FROM_PATH = @top_srcdir@/src diff --git a/npa/doc/Makefile.am b/npa/doc/Makefile.am new file mode 100644 index 0000000..c1a5d0e --- /dev/null +++ b/npa/doc/Makefile.am @@ -0,0 +1,25 @@ +ACLOCAL_AMFLAGS = -I m4 + +do_subst = sed \ + -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]builddir[@],$(builddir),g' \ + -e 's,[@]prefix[@],$(prefix),g' \ + -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ + -e 's,[@]libdir[@],$(libdir),g' \ + -e 's,[@]includedir[@],$(includedir),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \ + -e 's,[@]top_srcdir[@],$(top_srcdir),g' + +EXTRA_DIST = README.rst Doxyfile.in example.c + +if DOC_ENABLED +.PHONY: doc +doc : + $(do_subst) < Doxyfile.in > Doxyfile + $(DOXYGEN) Doxyfile +endif + +clean-local: + rm -f Doxyfile diff --git a/npa/README.dox b/npa/doc/README.rst similarity index 100% rename from npa/README.dox rename to npa/doc/README.rst diff --git a/doc/npaapi.rst b/npa/doc/api.rst similarity index 98% rename from doc/npaapi.rst rename to npa/doc/api.rst index 0af278d..e1df928 100644 --- a/doc/npaapi.rst +++ b/npa/doc/api.rst @@ -76,7 +76,7 @@ Example In order to compile and execute this example you need to correctly :ref:`set up your environment `. -.. literalinclude:: ../npa/src/example.c +.. literalinclude:: example.c :lines: 20- .. @author Frank Morgner diff --git a/npa/doc/example.c b/npa/doc/example.c new file mode 120000 index 0000000..f475e86 --- /dev/null +++ b/npa/doc/example.c @@ -0,0 +1 @@ +../src/example.c \ No newline at end of file diff --git a/pcsc-relay/Makefile.am b/pcsc-relay/Makefile.am index af437a6..3920780 100644 --- a/pcsc-relay/Makefile.am +++ b/pcsc-relay/Makefile.am @@ -1 +1 @@ -SUBDIRS = src +SUBDIRS = src doc diff --git a/pcsc-relay/README b/pcsc-relay/README deleted file mode 100644 index 06775bb..0000000 --- a/pcsc-relay/README +++ /dev/null @@ -1,82 +0,0 @@ -.. highlight:: sh - -.. _libnfc: http://www.libnfc.org/ -.. _PCSC-lite: http://pcsclite.alioth.debian.org/ - - -********** -pcsc-relay -********** - -:Authors: - - Dominik Oepen - - Frank Morgner -:License: - GPL version 3 -:Tested Platforms: - Linux (Debian, Ubuntu, OpenMoko) - -Welcome to pcsc-relay. The purpose of pcsc-relay is to forward APDUs from the -OpenPICC or from a libnfc device to a smart card via the PCSC middleware. You -can use this program in combination with the virtual smart card to emulate a -ISO/IEC 14443 smart card. - - -============ -Installation -============ - -pcsc-relay uses the GNU Build System to compile and install. If you are -unfamiliar with it, please have a look at the 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 pcsc-relay directory to get the -missing standard auxiliary files:: - - autoreconf -i - -pcsc-relay has the following dependencies: - -- PC/SC middleware -- libnfc_ - - ---------------- -Hints on libnfc ---------------- - -pcsc-relay links against libnfc_. Here is an example of how to get the standard -installation of the latter:: - - PREFIX=/tmp/install - LIBNFC=libnfc - svn co http://libnfc.googlecode.com/svn/trunk $LIBNFC - cd $LIBNFC - autoreconf -i - ./configure --prefix=$PREFIX - make - make install - -Building pcsc-relay with libnfc_ is done best using ``pkg-config``. The file -``libnfc.pc`` should be located in ``$INSTALL/lib/pkgconfig``. Here is how to -configure pcsc-relay to use it:: - - ./configure PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig - - -------------------------- -Hints on PC/SC middleware -------------------------- - -PC/SC is included by default in most modern operating systems. On Unix-like -systems (Linux, OS X, Sun OS) it is realized by PCSC-Lite_. To compile -pcsc-relay you will need to install the PCSC-Lite headers from your -distribution. Windows also ships with a PC/SC middleware in form of the -Winscard module. Microsoft's developement environment Visual Studio includes -all necessary data for building pcsc-relay. - - -========= -Questions -========= - -For questions, please use http://sourceforge.net/projects/vsmartcard/support diff --git a/pcsc-relay/README b/pcsc-relay/README new file mode 120000 index 0000000..2ad76b7 --- /dev/null +++ b/pcsc-relay/README @@ -0,0 +1 @@ +doc/README.rst \ No newline at end of file diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac index 82afed2..797b1c1 100644 --- a/pcsc-relay/configure.ac +++ b/pcsc-relay/configure.ac @@ -81,11 +81,13 @@ PCSC_CFLAGS: ${PCSC_CFLAGS} PCSC_LIBS: ${PCSC_LIBS} LIBNFC_CFLAGS: ${LIBNFC_CFLAGS} LIBNFC_LIBS: ${LIBNFC_LIBS} -OpenPICC device: ${PICCDEV} + +OpenPICC device: ${piccdev} EOF AC_CONFIG_FILES([Makefile + doc/Makefile src/Makefile]) AC_OUTPUT diff --git a/pcsc-relay/doc/Makefile.am b/pcsc-relay/doc/Makefile.am new file mode 100644 index 0000000..aa044b3 --- /dev/null +++ b/pcsc-relay/doc/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = README.rst diff --git a/pcsc-relay/doc/README.rst b/pcsc-relay/doc/README.rst new file mode 100644 index 0000000..06775bb --- /dev/null +++ b/pcsc-relay/doc/README.rst @@ -0,0 +1,82 @@ +.. highlight:: sh + +.. _libnfc: http://www.libnfc.org/ +.. _PCSC-lite: http://pcsclite.alioth.debian.org/ + + +********** +pcsc-relay +********** + +:Authors: + - Dominik Oepen + - Frank Morgner +:License: + GPL version 3 +:Tested Platforms: + Linux (Debian, Ubuntu, OpenMoko) + +Welcome to pcsc-relay. The purpose of pcsc-relay is to forward APDUs from the +OpenPICC or from a libnfc device to a smart card via the PCSC middleware. You +can use this program in combination with the virtual smart card to emulate a +ISO/IEC 14443 smart card. + + +============ +Installation +============ + +pcsc-relay uses the GNU Build System to compile and install. If you are +unfamiliar with it, please have a look at the 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 pcsc-relay directory to get the +missing standard auxiliary files:: + + autoreconf -i + +pcsc-relay has the following dependencies: + +- PC/SC middleware +- libnfc_ + + +--------------- +Hints on libnfc +--------------- + +pcsc-relay links against libnfc_. Here is an example of how to get the standard +installation of the latter:: + + PREFIX=/tmp/install + LIBNFC=libnfc + svn co http://libnfc.googlecode.com/svn/trunk $LIBNFC + cd $LIBNFC + autoreconf -i + ./configure --prefix=$PREFIX + make + make install + +Building pcsc-relay with libnfc_ is done best using ``pkg-config``. The file +``libnfc.pc`` should be located in ``$INSTALL/lib/pkgconfig``. Here is how to +configure pcsc-relay to use it:: + + ./configure PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig + + +------------------------- +Hints on PC/SC middleware +------------------------- + +PC/SC is included by default in most modern operating systems. On Unix-like +systems (Linux, OS X, Sun OS) it is realized by PCSC-Lite_. To compile +pcsc-relay you will need to install the PCSC-Lite headers from your +distribution. Windows also ships with a PC/SC middleware in form of the +Winscard module. Microsoft's developement environment Visual Studio includes +all necessary data for building pcsc-relay. + + +========= +Questions +========= + +For questions, please use http://sourceforge.net/projects/vsmartcard/support diff --git a/virtualsmartcard/Makefile.am b/virtualsmartcard/Makefile.am index 0a7b929..3920780 100644 --- a/virtualsmartcard/Makefile.am +++ b/virtualsmartcard/Makefile.am @@ -1,2 +1 @@ -ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src +SUBDIRS = src doc diff --git a/virtualsmartcard/README b/virtualsmartcard/README deleted file mode 100644 index 4dd3430..0000000 --- a/virtualsmartcard/README +++ /dev/null @@ -1,85 +0,0 @@ -.. highlight:: sh - -.. _PBKDF2: https://www.dlitz.net/software/python-pbkdf2/ -.. _PCSC-lite: http://pcsclite.alioth.debian.org/ -.. _PCSC-lite: http://pcsclite.alioth.debian.org/ -.. _PIP: http://www.pythonware.com/products/pil/ -.. _PyCrypto: http://pycrypto.org/ -.. _Python: http://www.python.org/ -.. _cyberflex-shell: https://github.com/henryk/cyberflex-shell -.. _pyscard: http://pyscard.sourceforge.net/ - - -****************** -Virtual Smart Card -****************** - -:Authors: - - Frank Morgner - - Dominik Oepen -:License: - GPL version 3 -:Tested Platforms: - - Linux (Debian, Ubuntu, OpenMoko) - - Windows (only virtual smart card, not the virtual reader) - -Welcome to virtualsmartcard. The purpose of virtualsmartcard is to emulate a -smart card and make it accessible through PCSC. Currently the virtual smart -card supports almost all commands of ISO-7816 including secure messaging. -Besides a plain ISO-7816 smart card it is also possible to emulate a German -ePass (only basic access control) and a rudimentary Cryptoflex smart card. The -virtual smart card (vpicc) can be accessed through the virtual smart card -reader (vpcd) which is a driver for ``pcscd`` of PCSC-Lite_. - -By default the vicc communicates with the vpcd through a socket on localhost -port 35963. The file ``utils.py`` was taken from Henryk Plötz's -cyberflex-shell_. - - ------------- -Installation ------------- - -virtualsmartcard uses the GNU Build System to compile and install. If you are -unfamiliar with it, please have a look at the 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 virtualsmartcard directory to get -the missing standard auxiliary files:: - - autoreconf -i - -Depending on your usage of the vpicc you might or might not need -the following: - -- Python_ -- pyscard_ -- PyCrypto_ -- PBKDF2_ -- PIP_ - -The vpcd has the following dependencies: - -- PCSC-Lite_ - - ------------------------- -Running virtualsmartcard ------------------------- - -First you need to make sure that pcscd loads the vpcd. You might need to run -``update-reader.conf`` to update pcscd's configuration file. Then ``pcscd -f --d`` should say something like ``Attempting startup of Virtual PCD`` - -Now you can run ``vicc`` which connects to the virtual reader. The -command ``vicc --help`` gives an overview about the command line -options. - -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. - - -Question ---------- - -For questions, please use http://sourceforge.net/projects/vsmartcard/support diff --git a/virtualsmartcard/README b/virtualsmartcard/README new file mode 120000 index 0000000..2ad76b7 --- /dev/null +++ b/virtualsmartcard/README @@ -0,0 +1 @@ +doc/README.rst \ No newline at end of file diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac index 0336d4b..85255df 100644 --- a/virtualsmartcard/configure.ac +++ b/virtualsmartcard/configure.ac @@ -134,5 +134,6 @@ AC_CONFIG_FILES([Makefile src/Makefile src/vpcd/Makefile src/vpicc/Makefile + doc/Makefile ]) AC_OUTPUT diff --git a/virtualsmartcard/doc/Makefile.am b/virtualsmartcard/doc/Makefile.am new file mode 100644 index 0000000..aa044b3 --- /dev/null +++ b/virtualsmartcard/doc/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = README.rst diff --git a/virtualsmartcard/doc/README.rst b/virtualsmartcard/doc/README.rst new file mode 100644 index 0000000..4dd3430 --- /dev/null +++ b/virtualsmartcard/doc/README.rst @@ -0,0 +1,85 @@ +.. highlight:: sh + +.. _PBKDF2: https://www.dlitz.net/software/python-pbkdf2/ +.. _PCSC-lite: http://pcsclite.alioth.debian.org/ +.. _PCSC-lite: http://pcsclite.alioth.debian.org/ +.. _PIP: http://www.pythonware.com/products/pil/ +.. _PyCrypto: http://pycrypto.org/ +.. _Python: http://www.python.org/ +.. _cyberflex-shell: https://github.com/henryk/cyberflex-shell +.. _pyscard: http://pyscard.sourceforge.net/ + + +****************** +Virtual Smart Card +****************** + +:Authors: + - Frank Morgner + - Dominik Oepen +:License: + GPL version 3 +:Tested Platforms: + - Linux (Debian, Ubuntu, OpenMoko) + - Windows (only virtual smart card, not the virtual reader) + +Welcome to virtualsmartcard. The purpose of virtualsmartcard is to emulate a +smart card and make it accessible through PCSC. Currently the virtual smart +card supports almost all commands of ISO-7816 including secure messaging. +Besides a plain ISO-7816 smart card it is also possible to emulate a German +ePass (only basic access control) and a rudimentary Cryptoflex smart card. The +virtual smart card (vpicc) can be accessed through the virtual smart card +reader (vpcd) which is a driver for ``pcscd`` of PCSC-Lite_. + +By default the vicc communicates with the vpcd through a socket on localhost +port 35963. The file ``utils.py`` was taken from Henryk Plötz's +cyberflex-shell_. + + +------------ +Installation +------------ + +virtualsmartcard uses the GNU Build System to compile and install. If you are +unfamiliar with it, please have a look at the 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 virtualsmartcard directory to get +the missing standard auxiliary files:: + + autoreconf -i + +Depending on your usage of the vpicc you might or might not need +the following: + +- Python_ +- pyscard_ +- PyCrypto_ +- PBKDF2_ +- PIP_ + +The vpcd has the following dependencies: + +- PCSC-Lite_ + + +------------------------ +Running virtualsmartcard +------------------------ + +First you need to make sure that pcscd loads the vpcd. You might need to run +``update-reader.conf`` to update pcscd's configuration file. Then ``pcscd -f +-d`` should say something like ``Attempting startup of Virtual PCD`` + +Now you can run ``vicc`` which connects to the virtual reader. The +command ``vicc --help`` gives an overview about the command line +options. + +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. + + +Question +--------- + +For questions, please use http://sourceforge.net/projects/vsmartcard/support diff --git a/virtualsmartcard/src/vpicc/Makefile.am b/virtualsmartcard/src/vpicc/Makefile.am index edec5c4..34838bd 100644 --- a/virtualsmartcard/src/vpicc/Makefile.am +++ b/virtualsmartcard/src/vpicc/Makefile.am @@ -1,6 +1,6 @@ bin_SCRIPTS = vicc CLEANFILES = $(bin_SCRIPTS) -EXTRA_DIST = vicc.in Doxyfile.in +EXTRA_DIST = vicc.in vpiccdir = $(pythondir)/virtualsmartcard vpicccardsdir = $(vpiccdir)/cards @@ -26,10 +26,3 @@ do_subst = sed -e 's,[@]PYTHON[@],$(PYTHON),g' vicc: vicc.in Makefile $(do_subst) < $(srcdir)/vicc.in > vicc chmod +x vicc - -if DOC_ENABLED -.PHONY: doc -doc: - $(do_subst) Doxyfile.in > Doxyfile - $(DOXYGEN) Doxyfile -endif