docs: replace BUILLDOCS with existing ENABLE_DEVEL_DOCS
Use the util-macros AM Conditionals to control generation of developers
documents. This is used throughout xorg modules.
The doxygen generated docs are now also managed by --enable-devel-docs.
Remove --enable-builddocs as this was last use for BUILDDOCS
*** From the RELEASE NOTES ***
New configure options for documentation in modules
--------------------------------------------------
As many more modules now contain documentation to be converted from DocBook XML to text,
HTML, PostScript, and/or PDF formats, new standard options have been added to the configure
macros to control the build of these in the modules.
--with-xmlto=yes|no
Enables or disables use of the xmlto [https://fedorahosted.org/
xmlto/] command to translate DocBook XML to other formats.
All DocBook XML conversions require use of this command.
--with-fop=yes|no
Enables or disables use of the Apache fop [http://
xmlgraphics.apache.org/fop/] command to translate DocBook
XML to PostScript and PDF formats.
--enable-docs=yes|no
Enables or disables the build and installation of all
documentation except traditional man pages or those covered
by the --enable-devel-docs and --enable-specs options.
--enable-devel-docs=yes|no
Enables or disables the build and installation of documentation
for developers of the X.Org software modules.
--enable-specs=yes|no
Enables or disables the build and installation of the formal
specification documents for protocols and APIs.
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
c78c71c3a8
commit
03ea0b7726
|
|
@ -581,9 +581,6 @@ AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11
|
||||||
[ XQUARTZ_SPARKLE="${enableval}" ],
|
[ XQUARTZ_SPARKLE="${enableval}" ],
|
||||||
[ XQUARTZ_SPARKLE="no" ])
|
[ XQUARTZ_SPARKLE="no" ])
|
||||||
AC_SUBST([XQUARTZ_SPARKLE])
|
AC_SUBST([XQUARTZ_SPARKLE])
|
||||||
AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
|
|
||||||
[BUILDDOCS=$enableval],
|
|
||||||
[BUILDDOCS=no])
|
|
||||||
AC_ARG_ENABLE(install-libxf86config,
|
AC_ARG_ENABLE(install-libxf86config,
|
||||||
AS_HELP_STRING([--enable-install-libxf86config],
|
AS_HELP_STRING([--enable-install-libxf86config],
|
||||||
[Install libxf86config (default: disabled)]),
|
[Install libxf86config (default: disabled)]),
|
||||||
|
|
@ -709,8 +706,6 @@ if test "x$INT10" = xyes; then
|
||||||
AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
|
AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Handle building documentation
|
|
||||||
AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
|
|
||||||
XORG_ENABLE_DOCS
|
XORG_ENABLE_DOCS
|
||||||
XORG_ENABLE_DEVEL_DOCS
|
XORG_ENABLE_DEVEL_DOCS
|
||||||
XORG_WITH_XMLTO(0.0.20)
|
XORG_WITH_XMLTO(0.0.20)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
SUBDIRS = input config examples
|
SUBDIRS = input config examples doc
|
||||||
bin_PROGRAMS = Xdmx
|
bin_PROGRAMS = Xdmx
|
||||||
|
|
||||||
if XINERAMA
|
if XINERAMA
|
||||||
|
|
@ -14,10 +14,6 @@ GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
|
||||||
GLX_DEFS = @GL_CFLAGS@
|
GLX_DEFS = @GL_CFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILDDOCS
|
|
||||||
SUBDIRS += doc
|
|
||||||
endif
|
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
-DHAVE_DMX_CONFIG_H \
|
-DHAVE_DMX_CONFIG_H \
|
||||||
$(DIX_CFLAGS) \
|
$(DIX_CFLAGS) \
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ doc_sources = dmx.xml scaled.xml
|
||||||
# Developer's documentation is not installed
|
# Developer's documentation is not installed
|
||||||
if ENABLE_DEVEL_DOCS
|
if ENABLE_DEVEL_DOCS
|
||||||
include $(top_srcdir)/doc/xml/xmlrules-noinst.in
|
include $(top_srcdir)/doc/xml/xmlrules-noinst.in
|
||||||
endif
|
|
||||||
|
|
||||||
if HAVE_DOXYGEN
|
if HAVE_DOXYGEN
|
||||||
|
|
||||||
|
|
@ -40,6 +39,7 @@ html/annotated.html: $(DOXYGEN_SRC)
|
||||||
maintainer-clean-local:
|
maintainer-clean-local:
|
||||||
rm -rf html/
|
rm -rf html/
|
||||||
endif
|
endif
|
||||||
|
endif ENABLE_DEVEL_DOCS
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
$(XML_FILES) \
|
$(XML_FILES) \
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,4 @@
|
||||||
if BUILDDOCS
|
|
||||||
SUBDIRS = devel man sgml
|
SUBDIRS = devel man sgml
|
||||||
else
|
|
||||||
SUBDIRS = man
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
README.modes
|
README.modes
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue