diff options
-rw-r--r-- | Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | man/Makefile.am | 80 |
3 files changed, 57 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 42d3d7f0..13df80c5 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -73,6 +73,12 @@ if HAVE_TEGRA | |||
73 | TEGRA_SUBDIR = tegra | 73 | TEGRA_SUBDIR = tegra |
74 | endif | 74 | endif |
75 | 75 | ||
76 | if BUILD_MANPAGES | ||
77 | if HAVE_MANPAGES_STYLESHEET | ||
78 | MAN_SUBDIR = man | ||
79 | endif | ||
80 | endif | ||
81 | |||
76 | SUBDIRS = \ | 82 | SUBDIRS = \ |
77 | . \ | 83 | . \ |
78 | $(LIBKMS_SUBDIR) \ | 84 | $(LIBKMS_SUBDIR) \ |
@@ -84,7 +90,7 @@ SUBDIRS = \ | |||
84 | $(FREEDRENO_SUBDIR) \ | 90 | $(FREEDRENO_SUBDIR) \ |
85 | $(TEGRA_SUBDIR) \ | 91 | $(TEGRA_SUBDIR) \ |
86 | tests \ | 92 | tests \ |
87 | man | 93 | $(MAN_SUBDIR) |
88 | 94 | ||
89 | libdrm_la_LTLIBRARIES = libdrm.la | 95 | libdrm_la_LTLIBRARIES = libdrm.la |
90 | libdrm_ladir = $(libdir) | 96 | libdrm_ladir = $(libdir) |
diff --git a/configure.ac b/configure.ac index 320e482e..f8adf4f6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -29,6 +29,13 @@ AC_CONFIG_SRCDIR([Makefile.am]) | |||
29 | AC_CONFIG_MACRO_DIR([m4]) | 29 | AC_CONFIG_MACRO_DIR([m4]) |
30 | AC_CONFIG_AUX_DIR([build-aux]) | 30 | AC_CONFIG_AUX_DIR([build-aux]) |
31 | 31 | ||
32 | # Require xorg-macros minimum of 1.12 for XORG_WITH_XSLTPROC | ||
33 | m4_ifndef([XORG_MACROS_VERSION], | ||
34 | [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) | ||
35 | XORG_MACROS_VERSION(1.12) | ||
36 | XORG_WITH_XSLTPROC | ||
37 | XORG_MANPAGE_SECTIONS | ||
38 | |||
32 | AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) | 39 | AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) |
33 | 40 | ||
34 | # Enable quiet compiles on automake 1.11. | 41 | # Enable quiet compiles on automake 1.11. |
@@ -378,9 +385,8 @@ AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes]) | |||
378 | 385 | ||
379 | # xsltproc for docbook manpages | 386 | # xsltproc for docbook manpages |
380 | AC_ARG_ENABLE([manpages], | 387 | AC_ARG_ENABLE([manpages], |
381 | AS_HELP_STRING([--disable-manpages], [disable manpages @<:@default=enabled@:>@]), | 388 | AS_HELP_STRING([--enable-manpages], [enable manpages @<:@default=auto@:>@]), |
382 | [MANS=$enableval], [MANS=auto]) | 389 | [MANS=$enableval], [MANS=auto]) |
383 | AC_PATH_PROG(XSLTPROC, xsltproc) | ||
384 | AM_CONDITIONAL([BUILD_MANPAGES], [test "x$XSLTPROC" != "x" -a "x$MANS" != "xno"]) | 390 | AM_CONDITIONAL([BUILD_MANPAGES], [test "x$XSLTPROC" != "x" -a "x$MANS" != "xno"]) |
385 | 391 | ||
386 | # check for offline man-pages stylesheet | 392 | # check for offline man-pages stylesheet |
diff --git a/man/Makefile.am b/man/Makefile.am index d25a2936..44b63a57 100644 --- a/man/Makefile.am +++ b/man/Makefile.am | |||
@@ -1,63 +1,67 @@ | |||
1 | # | 1 | # |
2 | # This generates man-pages out of the Docbook XML files. Simply add your files | 2 | # This generates man-pages out of the Docbook XML files. Simply add your files |
3 | # to the $MANPAGES array. If aliases are created, please add them to the | 3 | # to the relevant *man_PRE array. If aliases are created, please add them to the |
4 | # MANPAGES_ALIASES array so they get installed correctly. | 4 | # *man_aliases_PRE array so they get installed correctly. |
5 | # | 5 | # |
6 | 6 | ||
7 | MANPAGES = \ | 7 | libman_PRE = \ |
8 | drm.7 \ | 8 | drmAvailable.xml \ |
9 | drm-kms.7 \ | 9 | drmHandleEvent.xml \ |
10 | drm-memory.7 \ | 10 | drmModeGetResources.xml |
11 | drmAvailable.3 \ | ||
12 | drmHandleEvent.3 \ | ||
13 | drmModeGetResources.3 | ||
14 | MANPAGES_ALIASES = \ | ||
15 | drm-mm.7 \ | ||
16 | drm-gem.7 \ | ||
17 | drm-ttm.7 | ||
18 | 11 | ||
19 | XML_FILES = \ | 12 | miscman_PRE = \ |
20 | $(patsubst %.1,%.xml,$(patsubst %.3,%.xml,$(patsubst %.5,%.xml,$(patsubst %.7,%.xml,$(MANPAGES))))) | 13 | drm.xml \ |
14 | drm-kms.xml \ | ||
15 | drm-memory.xml | ||
21 | 16 | ||
22 | EXTRA_DIST = $(XML_FILES) | 17 | miscman_aliases_PRE = \ |
23 | CLEANFILES = $(MANPAGES) $(MANPAGES_ALIASES) .man_fixup | 18 | drm-mm.xml \ |
24 | man_MANS = | 19 | drm-gem.xml \ |
20 | drm-ttm.xml | ||
21 | |||
22 | libmandir = $(LIB_MAN_DIR) | ||
23 | miscmandir = $(MISC_MAN_DIR) | ||
24 | miscman_aliasesdir = $(MISC_MAN_DIR) | ||
25 | 25 | ||
26 | if BUILD_MANPAGES | 26 | libman_DATA = $(libman_PRE:.xml=.$(LIB_MAN_SUFFIX)) |
27 | if HAVE_MANPAGES_STYLESHEET | 27 | miscman_DATA = $(miscman_PRE:.xml=.$(MISC_MAN_SUFFIX)) |
28 | miscman_aliases_DATA = $(miscman_aliases_PRE:.xml=.$(MISC_MAN_SUFFIX)) | ||
28 | 29 | ||
29 | man_MANS += $(MANPAGES) $(MANPAGES_ALIASES) | 30 | XML_FILES = \ |
31 | $(libman_PRE) \ | ||
32 | $(miscman_PRE) | ||
33 | |||
34 | MAN_FILES = \ | ||
35 | $(libman_DATA) \ | ||
36 | $(miscman_DATA) \ | ||
37 | $(miscman_aliases_DATA) | ||
38 | |||
39 | EXTRA_DIST = $(XML_FILES) | ||
40 | CLEANFILES = $(MAN_FILES) .man_fixup | ||
30 | 41 | ||
31 | XSLTPROC_FLAGS = \ | 42 | XSLTPROC_FLAGS = \ |
32 | --stringparam man.authors.section.enabled 0 \ | 43 | --stringparam man.authors.section.enabled 0 \ |
33 | --stringparam man.copyright.section.enabled 0 \ | 44 | --stringparam man.copyright.section.enabled 0 \ |
34 | --stringparam funcsynopsis.style ansi \ | 45 | --stringparam funcsynopsis.style ansi \ |
35 | --stringparam man.output.quietly 1 \ | 46 | --stringparam man.output.quietly 1 \ |
36 | --nonet | 47 | --nonet \ |
48 | $(MANPAGES_STYLESHEET) | ||
37 | 49 | ||
38 | XSLTPROC_PROCESS_MAN = \ | 50 | XSLTPROC_PROCESS_MAN = \ |
39 | $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ | 51 | $(AM_V_GEN)$(XSLTPROC) -o "$@" $(XSLTPROC_FLAGS) "$<" && \ |
40 | $(XSLTPROC) -o "$@" $(XSLTPROC_FLAGS) $(MANPAGES_STYLESHEET) "$<" && \ | ||
41 | touch .man_fixup | 52 | touch .man_fixup |
42 | 53 | ||
43 | # Force .man_fixup if $(MANPAGES) are not built | 54 | # Force .man_fixup if $(miscman_DATA) are not built |
44 | .man_fixup: | $(MANPAGES) | 55 | .man_fixup: | $(miscman_DATA) |
45 | @touch .man_fixup | 56 | $(AM_V_GEN)touch .man_fixup |
46 | 57 | ||
47 | $(MANPAGES_ALIASES): $(MANPAGES) .man_fixup | 58 | $(miscman_aliases_DATA): $(miscman_DATA) .man_fixup |
48 | $(AM_V_GEN)if test -n "$@" ; then $(SED) -i -e 's/^\.so \([a-z_]\+\)\.\([0-9]\)$$/\.so man\2\/\1\.\2/' "$@" ; fi | 59 | $(AM_V_GEN)if test -n "$@" ; then $(SED) -i -e 's/^\.so \([a-z_]\+\)\.\([0-9]\)$$/\.so man\2\/\1\.\2/' "$@" ; fi |
49 | 60 | ||
50 | %.1: $(top_srcdir)/man/%.xml | 61 | SUFFIXES = .$(LIB_MAN_SUFFIX) .$(MISC_MAN_SUFFIX) .xml |
51 | $(XSLTPROC_PROCESS_MAN) | ||
52 | 62 | ||
53 | %.3: $(top_srcdir)/man/%.xml | 63 | .xml.$(LIB_MAN_SUFFIX): |
54 | $(XSLTPROC_PROCESS_MAN) | 64 | $(XSLTPROC_PROCESS_MAN) |
55 | 65 | ||
56 | %.5: $(top_srcdir)/man/%.xml | 66 | .xml.$(MISC_MAN_SUFFIX): |
57 | $(XSLTPROC_PROCESS_MAN) | 67 | $(XSLTPROC_PROCESS_MAN) |
58 | |||
59 | %.7: $(top_srcdir)/man/%.xml | ||
60 | $(XSLTPROC_PROCESS_MAN) | ||
61 | |||
62 | endif # HAVE_MANPAGES_STYLESHEET | ||
63 | endif # BUILD_MANPAGES | ||