[PATCH intel-gpu-tools 3/4] Man pages still showing version 1.0 in the 1.1 release
Gaetan Nadon
memsize at videotron.ca
Mon Jan 2 08:17:55 PST 2012
The patch coverts the man subdir to the standard xorg man page makefile.
The version number is automatically updated when a new release is made.
The man page section number is no longer hard coded either.
The package util-macros at version 1.8 or greater is required.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 6 ++-
man/.gitignore | 1 -
man/Makefile.am | 44 ++++++++++++-------
man/{intel_audio_dump.1 => intel_audio_dump.man} | 2 +-
man/{intel_bios_dumper.1 => intel_bios_dumper.man} | 2 +-
man/{intel_bios_reader.1 => intel_bios_reader.man} | 2 +-
...intel_error_decode.1 => intel_error_decode.man} | 2 +-
man/{intel_gpu_top.1 => intel_gpu_top.man} | 2 +-
man/{intel_gtt.1 => intel_gtt.man} | 2 +-
man/{intel_lid.1 => intel_lid.man} | 2 +-
man/{intel_reg_dumper.1 => intel_reg_dumper.man} | 2 +-
man/{intel_reg_read.1 => intel_reg_read.man} | 2 +-
...intel_reg_snapshot.1 => intel_reg_snapshot.man} | 2 +-
man/{intel_reg_write.1 => intel_reg_write.man} | 2 +-
man/{intel_stepping.1 => intel_stepping.man} | 2 +-
...ad_blit_large.1 => intel_upload_blit_large.man} | 2 +-
...large_gtt.1 => intel_upload_blit_large_gtt.man} | 2 +-
...large_map.1 => intel_upload_blit_large_map.man} | 2 +-
...ad_blit_small.1 => intel_upload_blit_small.man} | 2 +-
19 files changed, 48 insertions(+), 35 deletions(-)
delete mode 100644 man/.gitignore
rename man/{intel_audio_dump.1 => intel_audio_dump.man} (85%)
rename man/{intel_bios_dumper.1 => intel_bios_dumper.man} (88%)
rename man/{intel_bios_reader.1 => intel_bios_reader.man} (90%)
rename man/{intel_error_decode.1 => intel_error_decode.man} (91%)
rename man/{intel_gpu_top.1 => intel_gpu_top.man} (96%)
rename man/{intel_gtt.1 => intel_gtt.man} (90%)
rename man/{intel_lid.1 => intel_lid.man} (89%)
rename man/{intel_reg_dumper.1 => intel_reg_dumper.man} (93%)
rename man/{intel_reg_read.1 => intel_reg_read.man} (89%)
rename man/{intel_reg_snapshot.1 => intel_reg_snapshot.man} (87%)
rename man/{intel_reg_write.1 => intel_reg_write.man} (89%)
rename man/{intel_stepping.1 => intel_stepping.man} (90%)
rename man/{intel_upload_blit_large.1 => intel_upload_blit_large.man} (90%)
rename man/{intel_upload_blit_large_gtt.1 => intel_upload_blit_large_gtt.man} (89%)
rename man/{intel_upload_blit_large_map.1 => intel_upload_blit_large_map.man} (89%)
rename man/{intel_upload_blit_small.1 => intel_upload_blit_small.man} (90%)
diff --git a/configure.ac b/configure.ac
index 5d89b30..dd3752b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,8 +97,10 @@ if test "x$SHADER_DEBUGGER" = xyes; then
fi
fi
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_CONFIG_FILES([
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index af65d61..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!*.1
diff --git a/man/Makefile.am b/man/Makefile.am
index 5187abd..2b54195 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,16 +1,28 @@
-dist_man1_MANS = \
- intel_audio_dump.1 \
- intel_bios_dumper.1 \
- intel_bios_reader.1 \
- intel_error_decode.1 \
- intel_gpu_top.1 \
- intel_gtt.1 \
- intel_lid.1 \
- intel_reg_dumper.1 \
- intel_reg_read.1 \
- intel_reg_write.1 \
- intel_stepping.1 \
- intel_upload_blit_large.1 \
- intel_upload_blit_large_gtt.1 \
- intel_upload_blit_large_map.1 \
- intel_upload_blit_small.1
+appmandir = $(APP_MAN_DIR)
+appman_PRE = \
+ intel_audio_dump.man \
+ intel_bios_dumper.man \
+ intel_bios_reader.man \
+ intel_error_decode.man \
+ intel_gpu_top.man \
+ intel_gtt.man \
+ intel_lid.man \
+ intel_reg_dumper.man \
+ intel_reg_read.man \
+ intel_reg_write.man \
+ intel_stepping.man \
+ intel_upload_blit_large.man \
+ intel_upload_blit_large_gtt.man \
+ intel_upload_blit_large_map.man \
+ intel_upload_blit_small.man
+
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/intel_audio_dump.1 b/man/intel_audio_dump.man
similarity index 85%
rename from man/intel_audio_dump.1
rename to man/intel_audio_dump.man
index 3d636c9..89a81ec 100644
--- a/man/intel_audio_dump.1
+++ b/man/intel_audio_dump.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_audio_dump 1 "intel_audio_dump 1.0"
+.TH intel_audio_dump __appmansuffix__ __xorgversion__
.SH NAME
intel_audio_dump \- Dumps the Intel GPU registers for HDMI audio setup.
.SH SYNOPSIS
diff --git a/man/intel_bios_dumper.1 b/man/intel_bios_dumper.man
similarity index 88%
rename from man/intel_bios_dumper.1
rename to man/intel_bios_dumper.man
index 062e0ff..0813a55 100644
--- a/man/intel_bios_dumper.1
+++ b/man/intel_bios_dumper.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_bios_dumper 1 "intel_bios_dumper 1.0"
+.TH intel_bios_dumper __appmansuffix__ __xorgversion__
.SH NAME
intel_bios_dumper \- Saves the Intel video BIOS contents to a file.
.SH SYNOPSIS
diff --git a/man/intel_bios_reader.1 b/man/intel_bios_reader.man
similarity index 90%
rename from man/intel_bios_reader.1
rename to man/intel_bios_reader.man
index cabc110..2f125fc 100644
--- a/man/intel_bios_reader.1
+++ b/man/intel_bios_reader.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_bios_reader 1 "intel_bios_dumper 1.0"
+.TH intel_bios_reader __appmansuffix__ __xorgversion__
.SH NAME
intel_bios_reader \- Parses an Intel BIOS and displays many of its tables
.SH SYNOPSIS
diff --git a/man/intel_error_decode.1 b/man/intel_error_decode.man
similarity index 91%
rename from man/intel_error_decode.1
rename to man/intel_error_decode.man
index db03bb6..e53d898 100644
--- a/man/intel_error_decode.1
+++ b/man/intel_error_decode.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_error_decode 1 "intel_error_decode 1.0"
+.TH intel_error_decode __appmansuffix__ __xorgversion__
.SH NAME
intel_error_decode \- Decodes an Intel GPU dump automatically captured by the kernel at the time of an error.
.SH SYNOPSIS
diff --git a/man/intel_gpu_top.1 b/man/intel_gpu_top.man
similarity index 96%
rename from man/intel_gpu_top.1
rename to man/intel_gpu_top.man
index 1a483fc..b307a23 100644
--- a/man/intel_gpu_top.1
+++ b/man/intel_gpu_top.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_gpu_top 1 "intel_gpu_top 1.0"
+.TH intel_gpu_top __appmansuffix__ __xorgversion__
.SH NAME
intel_gpu_top \- Display a top-like summary of Intel GPU usage
.SH SYNOPSIS
diff --git a/man/intel_gtt.1 b/man/intel_gtt.man
similarity index 90%
rename from man/intel_gtt.1
rename to man/intel_gtt.man
index dd036af..8b23f28 100644
--- a/man/intel_gtt.1
+++ b/man/intel_gtt.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_gtt 1 "intel_gtt 1.0"
+.TH intel_gtt __appmansuffix__ __xorgversion__
.SH NAME
intel_gtt \- Dump the contents of an Intel GPU's GTT
.SH SYNOPSIS
diff --git a/man/intel_lid.1 b/man/intel_lid.man
similarity index 89%
rename from man/intel_lid.1
rename to man/intel_lid.man
index 97fd531..d06af79 100644
--- a/man/intel_lid.1
+++ b/man/intel_lid.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_lid 1 "intel_lid 1.0"
+.TH intel_lid __appmansuffix__ __xorgversion__
.SH NAME
intel_ \- Polls the values of different reports about laptop lid state.
.SH SYNOPSIS
diff --git a/man/intel_reg_dumper.1 b/man/intel_reg_dumper.man
similarity index 93%
rename from man/intel_reg_dumper.1
rename to man/intel_reg_dumper.man
index a92b054..63f3dcd 100644
--- a/man/intel_reg_dumper.1
+++ b/man/intel_reg_dumper.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_reg_dumper 1 "intel_reg_dumper 1.0"
+.TH intel_reg_dumper __appmansuffix__ __xorgversion__
.SH NAME
intel_reg_dumper \- Decode a bunch of Intel GPU registers for debugging
.SH SYNOPSIS
diff --git a/man/intel_reg_read.1 b/man/intel_reg_read.man
similarity index 89%
rename from man/intel_reg_read.1
rename to man/intel_reg_read.man
index 60aed9d..cc2bf61 100644
--- a/man/intel_reg_read.1
+++ b/man/intel_reg_read.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_reg_read 1 "intel_reg_read 1.0"
+.TH intel_reg_read __appmansuffix__ __xorgversion__
.SH NAME
intel_reg_read \- Reads an Intel GPU register value
.SH SYNOPSIS
diff --git a/man/intel_reg_snapshot.1 b/man/intel_reg_snapshot.man
similarity index 87%
rename from man/intel_reg_snapshot.1
rename to man/intel_reg_snapshot.man
index 07cfb6e..1930f61 100644
--- a/man/intel_reg_snapshot.1
+++ b/man/intel_reg_snapshot.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_reg_snapshot 1 "intel_reg_snapshot 1.0"
+.TH intel_reg_snapshot __appmansuffix__ __xorgversion__
.SH NAME
intel_reg_snapshot \- Take a GPU register snapshot
.SH SYNOPSIS
diff --git a/man/intel_reg_write.1 b/man/intel_reg_write.man
similarity index 89%
rename from man/intel_reg_write.1
rename to man/intel_reg_write.man
index d70c5c6..cb1731c 100644
--- a/man/intel_reg_write.1
+++ b/man/intel_reg_write.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_reg_write 1 "intel_reg_write 1.0"
+.TH intel_reg_write __appmansuffix__ __xorgversion__
.SH NAME
intel_reg_write \- Set an Intel GPU register to a value
.SH SYNOPSIS
diff --git a/man/intel_stepping.1 b/man/intel_stepping.man
similarity index 90%
rename from man/intel_stepping.1
rename to man/intel_stepping.man
index 7221b49..fe17210 100644
--- a/man/intel_stepping.1
+++ b/man/intel_stepping.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_stepping 1 "intel_stepping 1.0"
+.TH intel_stepping __appmansuffix__ __xorgversion__
.SH NAME
intel_stepping \- Display the stepping information for an Intel GPU
.SH SYNOPSIS
diff --git a/man/intel_upload_blit_large.1 b/man/intel_upload_blit_large.man
similarity index 90%
rename from man/intel_upload_blit_large.1
rename to man/intel_upload_blit_large.man
index 0f7e4aa..9c75e1a 100644
--- a/man/intel_upload_blit_large.1
+++ b/man/intel_upload_blit_large.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_upload_blit_large 1 "intel_upload_blit_large 1.0"
+.TH intel_upload_blit_large __appmansuffix__ __xorgversion__
.SH NAME
intel_upload_blit_large \- microbenchmark of Intel GPU performance
.SH SYNOPSIS
diff --git a/man/intel_upload_blit_large_gtt.1 b/man/intel_upload_blit_large_gtt.man
similarity index 89%
rename from man/intel_upload_blit_large_gtt.1
rename to man/intel_upload_blit_large_gtt.man
index 289f8ff..fbe4623 100644
--- a/man/intel_upload_blit_large_gtt.1
+++ b/man/intel_upload_blit_large_gtt.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_upload_blit_large_gtt 1 "intel_upload_blit_large_gtt 1.0"
+.TH intel_upload_blit_large_gtt __appmansuffix__ __xorgversion__
.SH NAME
intel_upload_blit_large_gtt \- microbenchmark of Intel GPU performance
.SH SYNOPSIS
diff --git a/man/intel_upload_blit_large_map.1 b/man/intel_upload_blit_large_map.man
similarity index 89%
rename from man/intel_upload_blit_large_map.1
rename to man/intel_upload_blit_large_map.man
index b558b85..04123f3 100644
--- a/man/intel_upload_blit_large_map.1
+++ b/man/intel_upload_blit_large_map.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_upload_blit_large_map 1 "intel_upload_blit_large_map 1.0"
+.TH intel_upload_blit_large_map __appmansuffix__ __xorgversion__
.SH NAME
intel_upload_blit_large_map \- microbenchmark of Intel GPU performance
.SH SYNOPSIS
diff --git a/man/intel_upload_blit_small.1 b/man/intel_upload_blit_small.man
similarity index 90%
rename from man/intel_upload_blit_small.1
rename to man/intel_upload_blit_small.man
index d3773b5..478bbfc 100644
--- a/man/intel_upload_blit_small.1
+++ b/man/intel_upload_blit_small.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH intel_upload_blit_small 1 "intel_upload_blit_small 1.0"
+.TH intel_upload_blit_small __appmansuffix__ __xorgversion__
.SH NAME
intel_upload_blit_small \- microbenchmark of Intel GPU performance
.SH SYNOPSIS
--
1.7.5.4
More information about the xorg-devel
mailing list