From 8d38172d866775594af3185ae3fbd8d750677650 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 14 Feb 2010 13:47:55 +0000 Subject: Updated to xorg-server-1.7.99.901 --- xorg-server/doc/Makefile.in | 72 +++++++++++++++----------------------------- xorg-server/doc/c-extensions | 61 ------------------------------------- 2 files changed, 24 insertions(+), 109 deletions(-) delete mode 100644 xorg-server/doc/c-extensions (limited to 'xorg-server/doc') diff --git a/xorg-server/doc/Makefile.in b/xorg-server/doc/Makefile.in index ef23f29c7..c081fa062 100644 --- a/xorg-server/doc/Makefile.in +++ b/xorg-server/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -89,8 +89,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(filemandir)" -DATA = $(appman_DATA) $(fileman_DATA) +am__installdirs = "$(DESTDIR)$(appmandir)" +DATA = $(appman_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -266,8 +266,11 @@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ STRIP = @STRIP@ +SYSCONFDIR = @SYSCONFDIR@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ +UDEV_CFLAGS = @UDEV_CFLAGS@ +UDEV_LIBS = @UDEV_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ @@ -327,6 +330,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@ XWIN_SYS_LIBS = @XWIN_SYS_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ +__XCONFIGDIR__ = @__XCONFIGDIR__@ __XCONFIGFILE__ = @__XCONFIGFILE__@ abi_ansic = @abi_ansic@ abi_extension = @abi_extension@ @@ -390,22 +394,16 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -appmandir = $(APP_MAN_DIR) -filemandir = $(FILE_MAN_DIR) # Xserver.man covers options generic to all X servers built in this tree # (i.e. those handled in the os/utils.c options processing instead of in # the DDX-level options processing) +appmandir = $(APP_MAN_DIR) appman_PRE = Xserver.man.pre -fileman_PRE = appman_PROCESSED = $(appman_PRE:man.pre=man) -fileman_PROCESSED = $(fileman_PRE:man.pre=man) appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@) -fileman_DATA = $(fileman_PRE:man.pre=@FILE_MAN_SUFFIX@) -BUILT_SOURCES = $(appman_PROCESSED) $(fileman_PROCESSED) -CLEANFILES = $(appman_PROCESSED) $(appman_DATA) \ - $(fileman_PROCESSED) $(fileman_DATA) - +BUILT_SOURCES = $(appman_PROCESSED) +CLEANFILES = $(appman_PROCESSED) $(appman_DATA) SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM @@ -437,7 +435,9 @@ MANDEFS = \ -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ -D__mandir__=$(mandir) \ -D__projectroot__=$(prefix) \ - -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \ + -D__datadir__=$(datadir) \ + -D__xconfigfile__=$(__XCONFIGFILE__) \ + -D__xconfigdir__=$(__XCONFIGDIR__) \ -D__xkbdir__=$(XKB_BASE_DIRECTORY) \ -D__modulepath__="$(DEFAULT_MODULE_PATH)" \ -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) @@ -451,7 +451,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .pre .man .man.pre .$(APP_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) +.SUFFIXES: .pre .man .man.pre .$(APP_MAN_SUFFIX) $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/cpprules.in $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -508,26 +508,6 @@ uninstall-appmanDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(appmandir)" && rm -f $$files -install-filemanDATA: $(fileman_DATA) - @$(NORMAL_INSTALL) - test -z "$(filemandir)" || $(MKDIR_P) "$(DESTDIR)$(filemandir)" - @list='$(fileman_DATA)'; test -n "$(filemandir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(filemandir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(filemandir)" || exit $$?; \ - done - -uninstall-filemanDATA: - @$(NORMAL_UNINSTALL) - @list='$(fileman_DATA)'; test -n "$(filemandir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(filemandir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(filemandir)" && rm -f $$files tags: TAGS TAGS: @@ -570,7 +550,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(filemandir)"; do \ + for dir in "$(DESTDIR)$(appmandir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -621,7 +601,7 @@ info: info-am info-am: -install-data-am: install-appmanDATA install-filemanDATA +install-data-am: install-appmanDATA install-dvi: install-dvi-am @@ -665,7 +645,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-appmanDATA uninstall-filemanDATA +uninstall-am: uninstall-appmanDATA .MAKE: all check install install-am install-strip @@ -673,14 +653,13 @@ uninstall-am: uninstall-appmanDATA uninstall-filemanDATA distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-appmanDATA install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am \ - install-filemanDATA 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 \ - uninstall-appmanDATA uninstall-filemanDATA + 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 uninstall-appmanDATA .pre: @@ -692,9 +671,6 @@ uninstall-am: uninstall-appmanDATA uninstall-filemanDATA .man.$(APP_MAN_SUFFIX): cp $< $@ -.man.$(FILE_MAN_SUFFIX): - cp $< $@ - # 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: diff --git a/xorg-server/doc/c-extensions b/xorg-server/doc/c-extensions deleted file mode 100644 index eb33e272b..000000000 --- a/xorg-server/doc/c-extensions +++ /dev/null @@ -1,61 +0,0 @@ -First of all: C89 or better. If you don't have that, port gcc first. - -Use of C language extensions throughout the X server tree ---------------------------------------------------------- - -Optional extensions: -The server will still build if your toolchain does not support these -extensions, although the results may not be optimal. - - * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.: - void parseOptions(Option *options _X_SENTINEL(0)); - parseOptions("foo", "bar", NULL); /* this is OK */ - parseOptions("foo", "bar", "baz"); /* this is not */ - This definition comes from Xfuncproto.h in the core - protocol headers. - * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics; - check the format string when built with - -Wformat (gcc) or similar. - * _X_EXPORT: this function should appear in symbol tables. - * _X_HIDDEN: this function should not appear in the _dynamic_ symbol - table. - * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function - is never called from another module. - * _X_INLINE: inline this functon if possible (generally obeyed unless - disabling optimisations). - * _X_DEPRECATED: warn on use of this function. - -Mandatory extensions: -The server will not build if your toolchain does not support these extensions. - - * named initialisers: explicitly initialising structure members, e.g.: - struct foo bar = { .baz = quux, .brian = "dog" }; - * variadic macros: macros with a variable number of arguments, e.g.: - #define DebugF(x, ...) /**/ - * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); } - - -Use of OS and library facilities throughout the X server tree -------------------------------------------------------------- - -Non-OS-dependent code can assume facilities at least as good as -the non-OS-facility parts of POSIX-1.2001. Ideally this would -be C99, but even gcc+glibc doesn't implement that yet. - -Unix-like systems are assumed to be at least as good as UNIX03. - -Linux systems must be at least 2.4 or later. As a practical matter -though, 2.4 kernels never receive any testing. Use 2.6 already. - -TODO: Solaris. - -TODO: *BSD. - -Code that needs to be portable to Windows should be careful to, -well, be portable. Note that there are two Windows ports, cygwin and -mingw. Cygwin is more or less like Linux, but mingw is a bit more -restrictive. TODO: document which versions of Windows we actually care -about. - -OSX support is generally limited to the most recent version. Currently -that means 10.5. -- cgit v1.2.3