From ff14d0d4829b5bd23e82f6ee5226ec8e90e941a5 Mon Sep 17 00:00:00 2001 From: aj Date: Fri, 2 Sep 2005 16:53:08 +0000 Subject: [PATCH] one more change to "make dist" style documentation generation. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2533 c6295689-39f2-0310-b995-f0e70906c6a9 --- Makefile.am | 9 ++------- doc/Makefile.am | 6 +++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0bc3d948..4a627b1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ # Process this file with automake to create Makefile.in -SUBDIRS = . aclocal doc etc macos man src win32 +SUBDIRS = . aclocal etc macos man src win32 +DIST_SUBDIRS = . aclocal doc etc macos man src win32 EXTRA_DIST = ANNOUNCE CodingStyle QUICKSTART README \ bootstrap Makefile.mak depcomp \ @@ -16,9 +17,3 @@ MAINTAINERCLEANFILES = \ DEPCLEANFILES = config.log configure AUTOMAKE_OPTIONS = foreign 1.5 - -dist: gendoc - -gendoc: - sh $(srcdir)/doc/export-wiki.sh $(srcdir)/doc - sh $(srcdir)/doc/old/generate.sh $(srcdir)/doc/old diff --git a/doc/Makefile.am b/doc/Makefile.am index 0ccdaf01..34b96a97 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,6 +4,10 @@ SUBDIRS = . old src MAINTAINERCLEANFILES = Makefile.in $(HTML) -EXTRA_DIST = README export-wiki.sh export-wiki.xsl $(HTML) +EXTRA_DIST = README export-wiki.sh export-wiki.xsl $(HTML) index.html HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css) + +index.html: + sh $(srcdir)/export-wiki.sh $(srcdir) + sh $(srcdir)/old/generate.sh $(srcdir)/old