xserver libX11 Xextproto mesa Git update 28 Feb 2011

4 files changed, 138 insertions, 122 deletions

diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 4bbc8bf88..8e7360288 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -24,34 +24,14 @@ doc_sources = dmx.xml scaled.xml
 # Developer's documentation is not installed
 if ENABLE_DEVEL_DOCS
 include $(top_srcdir)/doc/xml/xmlrules-noinst.in
-
-if HAVE_DOXYGEN
-
-DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
-
-all-local: html/annotated.html
-
-dist-local: html/annotated.html
-
-html/annotated.html: $(DOXYGEN_SRC)
-	$(DOXYGEN) $(srcdir)/doxygen.conf
-
-maintainer-clean-local:
-	rm -rf html/
-endif
 endif ENABLE_DEVEL_DOCS
 
-EXTRA_DIST = \
-	$(XML_FILES) \
-	DMXSpec.txt \
-	DMXSpec-v1.txt \
+DOXYGEN_HEAD=\
+	html/annotated.html
+
+DOXYGEN_REST= \
 	dmx.txt \
-	doxygen.conf \
-	doxygen.css \
-	doxygen.foot \
-	doxygen.head \
 	scaled.txt \
-	html/annotated.html \
 	html/ChkNotMaskEv_8c.html \
 	html/ChkNotMaskEv_8h.html \
 	html/ChkNotMaskEv_8h_source.html \
@@ -254,6 +234,41 @@ EXTRA_DIST = \
 	html/usb-private_8h.html \
 	html/usb-private_8h_source.html
 
+DOXYGEN_FILES=$(DOXYGEN_HEAD) $(DOXYGEN_REST)
+
+EXTRA_DIST = \
+	$(XML_FILES) \
+	DMXSpec.txt \
+	DMXSpec-v1.txt \
+	doxygen.conf \
+	doxygen.css \
+	doxygen.foot \
+	doxygen.head \
+	$(DOXYGEN_FILES)
+
+if ENABLE_DEVEL_DOCS
+if HAVE_DOXYGEN
+
+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
+
+all-local: $(DOXYGEN_FILES)
+
+dist-local: $(DOXYGEN_FILES)
+
+$(DOXYGEN_HEAD): $(DOXYGEN_SRC)
+	$(DOXYGEN) doxygen.conf
+
+$(DOXYGEN_REST): $(DOXYGEN_HEAD)
+
+maintainer-clean-local:
+	rm -rf html/ scaled.txt dmx.txt
+
+distclean-local:
+	rm -rf html/ scaled.txt dmx.txt
+
+endif HAVE_DOXYGEN
+endif ENABLE_DEVEL_DOCS
+
 $(builddir)/doxygen.head:
 	$(LN_S) $(srcdir)/doxygen.head $@
 
diff --git a/xorg-server/hw/dmx/doc/doxygen.conf b/xorg-server/hw/dmx/doc/doxygen.conf.in
index f7a541f90..f886a436f 100644
--- a/xorg-server/hw/dmx/doc/doxygen.conf
+++ b/xorg-server/hw/dmx/doc/doxygen.conf.in
@@ -344,9 +344,9 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = .. \
-                         ../input \
-                         ../config
+INPUT                  = @srcdir@/.. \
+                         @srcdir@/../input \
+                         @srcdir@/../config
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -367,9 +367,9 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../config/parser.c \
-                         ../config/parser.h \
-                         ../config/scanner.c
+EXCLUDE                = @srcdir@/../config/parser.c \
+                         @srcdir@/../config/parser.h \
+                         @srcdir@/../config/scanner.c
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
 # that are symbolic links (a Unix filesystem feature) are excluded from the input.
@@ -510,20 +510,20 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = doxygen.head
+HTML_HEADER            = @srcdir@/doxygen.head
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = doxygen.foot
+HTML_FOOTER            = @srcdir@/doxygen.foot
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet
 
-HTML_STYLESHEET        = doxygen.css
+HTML_STYLESHEET        = @srcdir@/doxygen.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
diff --git a/xorg-server/hw/xfree86/loader/Makefile.am b/xorg-server/hw/xfree86/loader/Makefile.am
index acacda650..7f386ccc0 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.am
+++ b/xorg-server/hw/xfree86/loader/Makefile.am
@@ -1,29 +1,30 @@
-noinst_LTLIBRARIES = libloader.la

-

-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \

-	   -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \

-	   -I$(srcdir)/../ramdac

-

-#AM_LDFLAGS = -r

-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

-

-EXTRA_DIST = \

-	loader.h \

-	loaderProcs.h \

-	sdksyms.sh

-

-libloader_la_SOURCES = \

-	loader.c \

-	loaderProcs.h \

-	loadext.c \

-        loadmod.c \

-	os.c \

-	sdksyms.c

-libloader_la_LIBADD = $(DLOPEN_LIBS)

-

-CLEANFILES = sdksyms.c sdksyms.dep

-

-sdksyms.dep sdksyms.c: sdksyms.sh

-	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)

-

-sinclude sdksyms.dep

+noinst_LTLIBRARIES = libloader.la
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
+	   -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \
+	   -I$(srcdir)/../ramdac
+
+#AM_LDFLAGS = -r
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+
+EXTRA_DIST = \
+	loader.h \
+	loaderProcs.h \
+	sdksyms.sh
+
+libloader_la_SOURCES = \
+	loader.c \
+	loaderProcs.h \
+	loadext.c \
+        loadmod.c \
+	os.c \
+	sdksyms.c
+libloader_la_LIBADD = $(DLOPEN_LIBS)
+
+CLEANFILES = sdksyms.c sdksyms.dep
+
+sdksyms.dep sdksyms.c: sdksyms.sh
+	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
+
+SDKSYMS_DEP = sdksyms.dep
+include $(SDKSYMS_DEP)
diff --git a/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am
index dae58bf89..303ff53f2 100644
--- a/xorg-server/hw/xwin/glx/Makefile.am
+++ b/xorg-server/hw/xwin/glx/Makefile.am
@@ -1,60 +1,60 @@
-noinst_LTLIBRARIES = libXwinGLX.la

-

-libXwinGLX_la_SOURCES = \

-	winpriv.c \

-	winpriv.h \

-	glwindows.h \

-	glwrap.c \

-	indirect.c \

-	wgl_ext_api.c

-

-if XWIN_MULTIWINDOW

-DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW

-endif

-

-if XWIN_MULTIWINDOWEXTWM

-DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM

-endif

-

-DEFS =  $(DEFS_MULTIWINDOW) $(DEFS_MULTIWINDOWEXTWM)

-

-INCLUDES = -I$(top_srcdir)/miext/rootless

-

-AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \

-            $(XWINMODULES_CFLAGS) \

-            -I$(top_srcdir) \

-            -I$(top_srcdir)/hw/xwin/

-

-glwrap.c: generated_gl_wrappers.c

-wgl_ext_api.c: generated_wgl_wrappers.c wglext.h

-wgl_ext_api.h: wglext.h

-indirect.c: wgl_ext_api.h

-

-SPEC_FILES = gl.spec gl.tm wglext.spec wgl.tm

-

-gl.spec:

-	wget http://www.opengl.org/registry/api/gl.spec

-

-gl.tm:

-	wget http://www.opengl.org/registry/api/gl.tm

-

-wglext.spec:

-	wget http://www.opengl.org/registry/api/wglext.spec

-

-wgl.tm:

-	wget http://www.opengl.org/registry/api/wgl.tm

-

-generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/gl.spec --typemap=$(srcdir)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

-

-generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/wglext.spec --typemap=$(srcdir)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

-

-wglext.h:

-	wget http://www.opengl.org/registry/api/wglext.h

-

-BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c

-CLEANFILES = $(BUILT_SOURCES)

-DISTCLEANFILES = $(SPEC_FILES) wglext.h

-

-EXTRA_DIST = gen_gl_wrappers.py $(SPEC_FILES) wglext.h

+noinst_LTLIBRARIES = libXwinGLX.la
+
+libXwinGLX_la_SOURCES = \
+	winpriv.c \
+	winpriv.h \
+	glwindows.h \
+	glwrap.c \
+	indirect.c \
+	wgl_ext_api.c
+
+if XWIN_MULTIWINDOW
+DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
+endif
+
+if XWIN_MULTIWINDOWEXTWM
+DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
+endif
+
+DEFS =  $(DEFS_MULTIWINDOW) $(DEFS_MULTIWINDOWEXTWM)
+
+INCLUDES = -I$(top_srcdir)/miext/rootless
+
+AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
+            $(XWINMODULES_CFLAGS) \
+            -I$(top_srcdir) \
+            -I$(top_srcdir)/hw/xwin/
+
+glwrap.c: generated_gl_wrappers.c
+wgl_ext_api.c: generated_wgl_wrappers.c wglext.h
+wgl_ext_api.h: wglext.h
+indirect.c: wgl_ext_api.h
+
+SPEC_FILES = gl.spec gl.tm wglext.spec wgl.tm
+
+gl.spec:
+	wget http://www.opengl.org/registry/api/gl.spec
+
+gl.tm:
+	wget http://www.opengl.org/registry/api/gl.tm
+
+wglext.spec:
+	wget http://www.opengl.org/registry/api/wglext.spec
+
+wgl.tm:
+	wget http://www.opengl.org/registry/api/wgl.tm
+
+generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm
+	$(srcdir)/gen_gl_wrappers.py --spec=`test -e gl.spec || echo $(srcdir)/`gl.spec --typemap=`test -e gl.tm || echo $(srcdir)/`gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c
+
+generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm
+	$(srcdir)/gen_gl_wrappers.py --spec=`test -e wglext.spec || echo $(srcdir)/`wglext.spec --typemap=`test -e wgl.tm || echo $(srcdir)/`wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c
+
+wglext.h:
+	wget http://www.opengl.org/registry/api/wglext.h
+
+BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(SPEC_FILES) wglext.h
+
+EXTRA_DIST = gen_gl_wrappers.py $(SPEC_FILES) wglext.h