diff options
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | man/.gitignore | 1 | ||||
-rw-r--r-- | man/Makefile.am | 44 | ||||
-rw-r--r-- | man/intel_audio_dump.man (renamed from man/intel_audio_dump.1) | 2 | ||||
-rw-r--r-- | man/intel_bios_dumper.man (renamed from man/intel_bios_dumper.1) | 2 | ||||
-rw-r--r-- | man/intel_bios_reader.man (renamed from man/intel_bios_reader.1) | 2 | ||||
-rw-r--r-- | man/intel_error_decode.man (renamed from man/intel_error_decode.1) | 2 | ||||
-rw-r--r-- | man/intel_gpu_top.man (renamed from man/intel_gpu_top.1) | 2 | ||||
-rw-r--r-- | man/intel_gtt.man (renamed from man/intel_gtt.1) | 2 | ||||
-rw-r--r-- | man/intel_lid.man (renamed from man/intel_lid.1) | 2 | ||||
-rw-r--r-- | man/intel_reg_dumper.man (renamed from man/intel_reg_dumper.1) | 2 | ||||
-rw-r--r-- | man/intel_reg_read.man (renamed from man/intel_reg_read.1) | 2 | ||||
-rw-r--r-- | man/intel_reg_snapshot.man (renamed from man/intel_reg_snapshot.1) | 2 | ||||
-rw-r--r-- | man/intel_reg_write.man (renamed from man/intel_reg_write.1) | 2 | ||||
-rw-r--r-- | man/intel_stepping.man (renamed from man/intel_stepping.1) | 2 | ||||
-rw-r--r-- | man/intel_upload_blit_large.man (renamed from man/intel_upload_blit_large.1) | 2 | ||||
-rw-r--r-- | man/intel_upload_blit_large_gtt.man (renamed from man/intel_upload_blit_large_gtt.1) | 2 | ||||
-rw-r--r-- | man/intel_upload_blit_large_map.man (renamed from man/intel_upload_blit_large_map.1) | 2 | ||||
-rw-r--r-- | man/intel_upload_blit_small.man (renamed from man/intel_upload_blit_small.1) | 2 |
19 files changed, 48 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 5d89b305..dd3752be 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 af65d61e..00000000 --- a/man/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!*.1 diff --git a/man/Makefile.am b/man/Makefile.am index 5187abde..2b541957 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 index 3d636c9f..89a81ec4 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 index 062e0ff8..0813a556 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 index cabc1105..2f125fc9 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 index db03bb6e..e53d898d 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 index 1a483fcb..b307a238 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 index dd036aff..8b23f287 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 index 97fd5317..d06af79b 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 index a92b054c..63f3dcdc 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 index 60aed9d3..cc2bf612 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 index 07cfb6e3..1930f613 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 index d70c5c6e..cb1731c6 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 index 7221b495..fe172107 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 index 0f7e4aae..9c75e1a1 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 index 289f8ff7..fbe4623c 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 index b558b85e..04123f3d 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 index d3773b55..478bbfc5 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 |