fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-17 00:00:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove GLX_CFLAGS and rely on Mesa including dix-config.h

Browse source
This commit is contained in:
David Reveman 2006-02-16 01:08:36 +00:00
parent f3fad0337d
commit 72d056f02c
15 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2006-02-16 David Reveman <davidr@novell.com>
* GL/mesa/tnl/Makefile.am (AM_CFLAGS):
* GL/mesa/swrast_setup/Makefile.am (AM_CFLAGS):
* GL/mesa/swrast/Makefile.am (AM_CFLAGS):
* GL/mesa/shader/slang/Makefile.am (AM_CFLAGS):
* GL/mesa/shader/grammar/Makefile.am (AM_CFLAGS):
* GL/mesa/shader/Makefile.am (AM_CFLAGS):
* GL/mesa/math/Makefile.am (AM_CFLAGS):
* GL/mesa/main/Makefile.am (AM_CFLAGS):
* GL/mesa/glapi/Makefile.am (AM_CFLAGS):
* GL/mesa/array_cache/Makefile.am (AM_CFLAGS):
* GL/mesa/X/Makefile.am (AM_CFLAGS):
* GL/mesa/Makefile.am (libGLcore_la_CFLAGS):
* GL/glx/Makefile.am (AM_CFLAGS): Remove GLX_CFLAGS, add DIX_CFLAGS.
* configure.ac: Remove GLX_CFLAGS.
2006-02-15 David Reveman <davidr@novell.com>
* GL/mesa/tnl/Makefile.am (AM_CFLAGS):

1
GL/glx/Makefile.am
View file

@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libglx.la
AM_CFLAGS = \
@DIX_CFLAGS@ \
@GL_CFLAGS@ \
@GLX_CFLAGS@ \
@XLIB_CFLAGS@ \
-I@MESA_SOURCE@/include \
-I@MESA_SOURCE@/src/mesa/glapi \

2
GL/mesa/Makefile.am
View file

@ -2,7 +2,7 @@ SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
noinst_LTLIBRARIES = libGLcore.la
libGLcore_la_CFLAGS = @GLX_CFLAGS@ -DUSE_MGL_NAMESPACE -UHAVE_CONFIG_H -DGLXEXT \
libGLcore_la_CFLAGS = @DIX_CFLAGS@ -DUSE_MGL_NAMESPACE -UHAVE_CONFIG_H -DGLXEXT \
-DXF86DRI -DGLX_DIRECT_RENDERING -DGLX_USE_DLOPEN -DGLX_USE_MESA
libGLcore_la_SOURCES = dummy.c

2
GL/mesa/X/Makefile.am
View file

@ -19,7 +19,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
# -DXFree86Server is required because the X11 driver in Mesa thinks that
# symbol means "being built in the server"
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
-DXFree86Server -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
-DXFree86Server -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \

2
GL/mesa/array_cache/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libac.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/glapi/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libglapi.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/main/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmain.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/math/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmath.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/shader/Makefile.am
View file

@ -2,7 +2,7 @@ SUBDIRS = grammar slang
noinst_LTLIBRARIES = libshader.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/shader/grammar/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libgrammar.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../../X \

2
GL/mesa/shader/slang/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libslang.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \

2
GL/mesa/swrast/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libswrast.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/swrast_setup/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libss.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

2
GL/mesa/tnl/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libtnl.la
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \

5
configure.ac
View file

@ -535,11 +535,6 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
PKG_CHECK_MODULES([XLIB], [x11])
AC_SUBST(XLIB_CFLAGS)
if test "$ac_cv_sizeof_unsigned_long" = 8; then
GLX_CFLAGS=-D_XSERVER64
fi
AC_SUBST(GLX_CFLAGS)
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
test -d GL || mkdir GL