From cf1da69dd47917f75147ab38f6041ad0fe66d952 Mon Sep 17 00:00:00 2001 From: Nils Carlson Date: Tue, 30 Nov 2010 14:11:23 +0100 Subject: [PATCH] Fix info automake and clean doc automake Fix so that info is built using automake and also clean up the automake process so that make clean works. Signed-off-by: Nils Carlson Acked-by: Mathieu Desnoyers --- .gitignore | 1 + configure.ac | 2 ++ doc/Makefile.am | 3 +-- doc/info/Makefile.am | 2 ++ doc/{manual/manual.texinfo => info/ust.texi} | 0 doc/man/Makefile.am | 2 ++ doc/manual/.gitignore | 1 - doc/manual/Makefile | 4 ---- 8 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 doc/info/Makefile.am rename doc/{manual/manual.texinfo => info/ust.texi} (100%) create mode 100644 doc/man/Makefile.am delete mode 100644 doc/manual/.gitignore delete mode 100644 doc/manual/Makefile diff --git a/.gitignore b/.gitignore index 4896a47..020c2f4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Makefile *.lo Makefile.in *.loT +*.info configure aclocal.m4 autom4te.cache/ diff --git a/configure.ac b/configure.ac index 922e626..4fcd565 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,8 @@ AC_MSG_RESULT($LIBFORMAT) AC_CONFIG_FILES([ Makefile doc/Makefile + doc/man/Makefile + doc/info/Makefile include/Makefile libust/Makefile tests/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index fa769be..37a55ac 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,2 +1 @@ -EXTRA_DIST = manual man/ustctl.1 man/ustd.1 man/usttrace.1 -man_MANS = man/ustctl.1 man/ustd.1 man/usttrace.1 +SUBDIRS = man info \ No newline at end of file diff --git a/doc/info/Makefile.am b/doc/info/Makefile.am new file mode 100644 index 0000000..93d1896 --- /dev/null +++ b/doc/info/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = ust.texi +info_TEXINFOS = ust.texi diff --git a/doc/manual/manual.texinfo b/doc/info/ust.texi similarity index 100% rename from doc/manual/manual.texinfo rename to doc/info/ust.texi diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am new file mode 100644 index 0000000..7e18b8e --- /dev/null +++ b/doc/man/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = ustctl.1 ustd.1 usttrace.1 +man_MANS = ustctl.1 ustd.1 usttrace.1 diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore deleted file mode 100644 index 2460008..0000000 --- a/doc/manual/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!Makefile diff --git a/doc/manual/Makefile b/doc/manual/Makefile deleted file mode 100644 index 62a430f..0000000 --- a/doc/manual/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all: ust.html - -ust.html: manual.texinfo - makeinfo --html --no-split manual.texinfo -- 2.34.1