svn merge ^/branches/released

1 files changed, 85 insertions, 114 deletions

diff --git a/xorg-server/hw/dmx/doc/Makefile.in b/xorg-server/hw/dmx/doc/Makefile.in
index 0fcef8ffa..95f7febd0 100644
--- a/xorg-server/hw/dmx/doc/Makefile.in
+++ b/xorg-server/hw/dmx/doc/Makefile.in
@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -92,7 +92,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -117,7 +116,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -141,6 +139,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -158,8 +157,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -205,7 +202,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -231,6 +227,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -240,7 +237,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -254,7 +250,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -296,8 +291,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -340,6 +333,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -371,7 +365,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -387,6 +380,7 @@ SGML_FILES = dmx.sgml scaled.sgml
 @BUILD_LINUXDOC_TRUE@SUFFIXES = .sgml .txt .html .ps .pdf
 @BUILD_LINUXDOC_TRUE@noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 @BUILD_LINUXDOC_TRUE@CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
+@HAVE_DOXYGEN_TRUE@DOXYGEN_SRC = doxygen.head doxygen.foot doxygen.css doxygen.conf
 EXTRA_DIST = \
 	$(SGML_FILES) \
 	DMXSpec.txt \
@@ -400,123 +394,116 @@ EXTRA_DIST = \
 	html/annotated.html \
 	html/ChkNotMaskEv_8c.html \
 	html/ChkNotMaskEv_8h.html \
-	html/ChkNotMaskEv_8h-source.html \
+	html/ChkNotMaskEv_8h_source.html \
 	html/classes.html \
 	html/dmx_8h.html \
-	html/dmx_8h-source.html \
+	html/dmx_8h_source.html \
 	html/dmxarg_8c.html \
 	html/dmxarg_8h.html \
-	html/dmxarg_8h-source.html \
+	html/dmxarg_8h_source.html \
 	html/dmxbackend_8c.html \
 	html/dmxbackend_8h.html \
-	html/dmxbackend_8h-source.html \
+	html/dmxbackend_8h_source.html \
 	html/dmxcb_8c.html \
 	html/dmxcb_8h.html \
-	html/dmxcb_8h-source.html \
+	html/dmxcb_8h_source.html \
 	html/dmxclient_8h.html \
-	html/dmxclient_8h-source.html \
+	html/dmxclient_8h_source.html \
 	html/dmxcmap_8c.html \
 	html/dmxcmap_8h.html \
-	html/dmxcmap_8h-source.html \
+	html/dmxcmap_8h_source.html \
 	html/dmxcommon_8c.html \
 	html/dmxcommon_8h.html \
-	html/dmxcommon_8h-source.html \
+	html/dmxcommon_8h_source.html \
 	html/dmxcompat_8c.html \
 	html/dmxcompat_8h.html \
-	html/dmxcompat_8h-source.html \
+	html/dmxcompat_8h_source.html \
 	html/dmxconfig_8c.html \
 	html/dmxconfig_8h.html \
-	html/dmxconfig_8h-source.html \
+	html/dmxconfig_8h_source.html \
 	html/dmxconsole_8c.html \
 	html/dmxconsole_8h.html \
-	html/dmxconsole_8h-source.html \
+	html/dmxconsole_8h_source.html \
 	html/dmxcursor_8c.html \
 	html/dmxcursor_8h.html \
-	html/dmxcursor_8h-source.html \
+	html/dmxcursor_8h_source.html \
 	html/dmxdetach_8c.html \
 	html/dmxdpms_8c.html \
 	html/dmxdpms_8h.html \
-	html/dmxdpms_8h-source.html \
+	html/dmxdpms_8h_source.html \
 	html/dmxdummy_8c.html \
 	html/dmxdummy_8h.html \
-	html/dmxdummy_8h-source.html \
-	html/dmxeq_8c.html \
-	html/dmxeq_8h.html \
-	html/dmxeq_8h-source.html \
+	html/dmxdummy_8h_source.html \
 	html/dmxevents_8c.html \
 	html/dmxevents_8h.html \
-	html/dmxevents_8h-source.html \
-	html/dmxext_8h.html \
-	html/dmxext_8h-source.html \
+	html/dmxevents_8h_source.html \
 	html/dmxextension_8c.html \
 	html/dmxextension_8h.html \
-	html/dmxextension_8h-source.html \
+	html/dmxextension_8h_source.html \
 	html/dmxfont_8c.html \
 	html/dmxfont_8h.html \
-	html/dmxfont_8h-source.html \
+	html/dmxfont_8h_source.html \
 	html/dmxgc_8c.html \
 	html/dmxgc_8h.html \
-	html/dmxgc_8h-source.html \
+	html/dmxgc_8h_source.html \
 	html/dmxgcops_8c.html \
 	html/dmxgcops_8h.html \
-	html/dmxgcops_8h-source.html \
-	html/dmx__glxvisuals_8h-source.html \
+	html/dmxgcops_8h_source.html \
+	html/dmx__glxvisuals_8h_source.html \
 	html/dmxinit_8c.html \
 	html/dmxinit_8h.html \
-	html/dmxinit_8h-source.html \
+	html/dmxinit_8h_source.html \
 	html/dmxinput_8c.html \
 	html/dmxinput_8h.html \
-	html/dmxinput_8h-source.html \
+	html/dmxinput_8h_source.html \
 	html/dmxinputinit_8c.html \
 	html/dmxinputinit_8h.html \
-	html/dmxinputinit_8h-source.html \
+	html/dmxinputinit_8h_source.html \
 	html/dmxlog_8c.html \
 	html/dmxlog_8h.html \
-	html/dmxlog_8h-source.html \
+	html/dmxlog_8h_source.html \
 	html/dmxmap_8c.html \
 	html/dmxmap_8h.html \
-	html/dmxmap_8h-source.html \
+	html/dmxmap_8h_source.html \
 	html/dmxmotion_8c.html \
 	html/dmxmotion_8h.html \
-	html/dmxmotion_8h-source.html \
+	html/dmxmotion_8h_source.html \
 	html/dmxparse_8c.html \
 	html/dmxparse_8h.html \
-	html/dmxparse_8h-source.html \
+	html/dmxparse_8h_source.html \
 	html/dmxpict_8c.html \
 	html/dmxpict_8h.html \
-	html/dmxpict_8h-source.html \
+	html/dmxpict_8h_source.html \
 	html/dmxpixmap_8c.html \
 	html/dmxpixmap_8h.html \
-	html/dmxpixmap_8h-source.html \
+	html/dmxpixmap_8h_source.html \
 	html/dmxprint_8c.html \
 	html/dmxprint_8h.html \
-	html/dmxprint_8h-source.html \
+	html/dmxprint_8h_source.html \
 	html/dmxprop_8c.html \
 	html/dmxprop_8h.html \
-	html/dmxprop_8h-source.html \
-	html/dmxproto_8h.html \
-	html/dmxproto_8h-source.html \
+	html/dmxprop_8h_source.html \
 	html/dmxscrinit_8c.html \
 	html/dmxscrinit_8h.html \
-	html/dmxscrinit_8h-source.html \
+	html/dmxscrinit_8h_source.html \
 	html/dmxshadow_8c.html \
 	html/dmxshadow_8h.html \
-	html/dmxshadow_8h-source.html \
+	html/dmxshadow_8h_source.html \
 	html/dmxsigio_8c.html \
 	html/dmxsigio_8h.html \
-	html/dmxsigio_8h-source.html \
+	html/dmxsigio_8h_source.html \
 	html/dmxstat_8c.html \
 	html/dmxstat_8h.html \
-	html/dmxstat_8h-source.html \
+	html/dmxstat_8h_source.html \
 	html/dmxsync_8c.html \
 	html/dmxsync_8h.html \
-	html/dmxsync_8h-source.html \
+	html/dmxsync_8h_source.html \
 	html/dmxvisual_8c.html \
 	html/dmxvisual_8h.html \
-	html/dmxvisual_8h-source.html \
+	html/dmxvisual_8h_source.html \
 	html/dmxwindow_8c.html \
 	html/dmxwindow_8h.html \
-	html/dmxwindow_8h-source.html \
+	html/dmxwindow_8h_source.html \
 	html/dmxxinput_8c.html \
 	html/doxygen.css \
 	html/doxygen.png \
@@ -543,18 +530,16 @@ EXTRA_DIST = \
 	html/globals_type.html \
 	html/globals_vars.html \
 	html/index.html \
-	html/lib_2dmx_2dmx_8c.html \
 	html/lnx-keyboard_8c.html \
 	html/lnx-keyboard_8h.html \
-	html/lnx-keyboard_8h-source.html \
+	html/lnx-keyboard_8h_source.html \
 	html/lnx-ms_8c.html \
 	html/lnx-ms_8h.html \
-	html/lnx-ms_8h-source.html \
+	html/lnx-ms_8h_source.html \
 	html/lnx-ps2_8c.html \
 	html/lnx-ps2_8h.html \
-	html/lnx-ps2_8h-source.html \
+	html/lnx-ps2_8h_source.html \
 	html/main.html \
-	html/programs_2Xserver_2Xext_2dmx_8c.html \
 	html/struct__dmxArg.html \
 	html/struct__dmxColormapPriv.html \
 	html/structDMXConfigCmdStruct.html \
@@ -574,76 +559,40 @@ EXTRA_DIST = \
 	html/struct__DMXConfigVirtual.html \
 	html/struct__DMXConfigWall.html \
 	html/struct__dmxCursorPriv.html \
-	html/structDMXDesktopAttributes.html \
 	html/structDMXDesktopAttributesRec.html \
 	html/struct__DMXEventMap.html \
 	html/struct__dmxFontPriv.html \
 	html/struct__dmxGCPriv.html \
 	html/structdmxGlxVisualPrivate.html \
 	html/struct__dmxGlyphPriv.html \
-	html/structDMXInputAttributes.html \
 	html/structDMXInputAttributesRec.html \
 	html/struct__DMXInputInfo.html \
 	html/struct__DMXLocalInitInfo.html \
 	html/struct__DMXLocalInputInfo.html \
 	html/struct__dmxPictPriv.html \
 	html/struct__dmxPixPriv.html \
-	html/structDMXScreenAttributes.html \
 	html/structDMXScreenAttributesRec.html \
 	html/struct__DMXScreenInfo.html \
 	html/struct__DMXStatAvg.html \
 	html/struct__DMXStatInfo.html \
-	html/structDMXWindowAttributes.html \
 	html/structDMXWindowAttributesRec.html \
 	html/struct__dmxWinPriv.html \
-	html/struct__Event.html \
-	html/struct__EventQueue.html \
 	html/struct__myPrivate.html \
-	html/structxDMXAddInputReply.html \
-	html/structxDMXAddInputReq.html \
-	html/structxDMXAddScreenReply.html \
-	html/structxDMXAddScreenReq.html \
-	html/structxDMXChangeDesktopAttributesReply.html \
-	html/structxDMXChangeDesktopAttributesReq.html \
-	html/structxDMXChangeScreensAttributesReply.html \
-	html/structxDMXChangeScreensAttributesReq.html \
-	html/structxDMXForceWindowCreationReply.html \
-	html/structxDMXForceWindowCreationReq.html \
-	html/structxDMXGetDesktopAttributesReply.html \
-	html/structxDMXGetDesktopAttributesReq.html \
-	html/structxDMXGetInputAttributesReply.html \
-	html/structxDMXGetInputAttributesReq.html \
-	html/structxDMXGetInputCountReply.html \
-	html/structxDMXGetInputCountReq.html \
-	html/structxDMXGetScreenAttributesReply.html \
-	html/structxDMXGetScreenAttributesReq.html \
-	html/structxDMXGetScreenCountReply.html \
-	html/structxDMXGetScreenCountReq.html \
-	html/structxDMXGetWindowAttributesReply.html \
-	html/structxDMXGetWindowAttributesReq.html \
-	html/structxDMXQueryVersionReply.html \
-	html/structxDMXQueryVersionReq.html \
-	html/structxDMXRemoveInputReply.html \
-	html/structxDMXRemoveInputReq.html \
-	html/structxDMXRemoveScreenReply.html \
-	html/structxDMXRemoveScreenReq.html \
-	html/structxDMXSyncReply.html \
-	html/structxDMXSyncReq.html \
 	html/tree.html \
 	html/usb-common_8c.html \
 	html/usb-common_8h.html \
-	html/usb-common_8h-source.html \
+	html/usb-common_8h_source.html \
 	html/usb-keyboard_8c.html \
 	html/usb-keyboard_8h.html \
-	html/usb-keyboard_8h-source.html \
+	html/usb-keyboard_8h_source.html \
 	html/usb-mouse_8c.html \
 	html/usb-mouse_8h.html \
-	html/usb-mouse_8h-source.html \
+	html/usb-mouse_8h_source.html \
 	html/usb-other_8c.html \
 	html/usb-other_8h.html \
-	html/usb-other_8h-source.html \
+	html/usb-other_8h_source.html \
 	html/usb-private_8h.html \
-	html/usb-private_8h-source.html
+	html/usb-private_8h_source.html
 
 all: all-am
 
@@ -724,7 +673,8 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA)
+@HAVE_DOXYGEN_FALSE@all-local:
+all-am: Makefile $(DATA) all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -752,9 +702,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@HAVE_DOXYGEN_FALSE@clean-local:
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -820,16 +771,17 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-local distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am
 
 
 @BUILD_LINUXDOC_TRUE@.sgml.txt:
@@ -848,6 +800,25 @@ uninstall-am:
 @BUILD_LINUXDOC_TRUE@	@rm -f $@
 @BUILD_LINUXDOC_TRUE@	$(MAKE_HTML) $<
 
+@HAVE_DOXYGEN_TRUE@all-local: html/annotated.html
+
+@HAVE_DOXYGEN_TRUE@dist-local: html/annotated.html
+
+@HAVE_DOXYGEN_TRUE@html/annotated.html: $(DOXYGEN_SRC)
+@HAVE_DOXYGEN_TRUE@	$(DOXYGEN) $(srcdir)/doxygen.conf
+
+@HAVE_DOXYGEN_TRUE@clean-local:
+@HAVE_DOXYGEN_TRUE@	rm -rf html/
+
+$(builddir)/doxygen.head:
+	$(LN_S) $(srcdir)/doxygen.head $@
+
+$(builddir)/doxygen.foot:
+	$(LN_S) $(srcdir)/doxygen.foot $@
+
+$(builddir)doxygen.css:
+	$(LN_S) $(srcdir)/doxygen.css $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: