Fix up paths for GL/glx -> glx renaming
(cherry picked from commit c76fddeea2
)
This commit is contained in:
parent
d325a207c8
commit
d3a2e060bf
@ -35,10 +35,10 @@
|
|||||||
#define _HAVE_XALLOC_DECLS
|
#define _HAVE_XALLOC_DECLS
|
||||||
#include "ephyrlog.h"
|
#include "ephyrlog.h"
|
||||||
#include <GL/glxproto.h>
|
#include <GL/glxproto.h>
|
||||||
#include "GL/glx/glxserver.h"
|
#include "glx/glxserver.h"
|
||||||
#include "GL/glx/indirect_table.h"
|
#include "glx/indirect_table.h"
|
||||||
#include "GL/glx/indirect_util.h"
|
#include "glx/indirect_util.h"
|
||||||
#include "GL/glx/unpack.h"
|
#include "glx/unpack.h"
|
||||||
#include "hostx.h"
|
#include "hostx.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ INCLUDES = @XORG_INCS@ \
|
|||||||
-I$(top_srcdir)/dbe \
|
-I$(top_srcdir)/dbe \
|
||||||
-I$(top_srcdir)/hw/xfree86/loader \
|
-I$(top_srcdir)/hw/xfree86/loader \
|
||||||
-I$(top_srcdir)/miext/shadow \
|
-I$(top_srcdir)/miext/shadow \
|
||||||
-I$(top_srcdir)/GL/glx
|
-I$(top_srcdir)/glx
|
||||||
|
|
||||||
libafb_la_LDFLAGS = -avoid-version
|
libafb_la_LDFLAGS = -avoid-version
|
||||||
libafb_la_LIBADD = $(top_builddir)/afb/libafb.la
|
libafb_la_LIBADD = $(top_builddir)/afb/libafb.la
|
||||||
@ -81,10 +81,10 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
|
|||||||
|
|
||||||
libglx_la_LDFLAGS = -avoid-version
|
libglx_la_LDFLAGS = -avoid-version
|
||||||
if AIGLX
|
if AIGLX
|
||||||
GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la
|
GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
|
||||||
endif
|
endif
|
||||||
libglx_la_LIBADD = \
|
libglx_la_LIBADD = \
|
||||||
$(top_builddir)/GL/glx/libglx.la \
|
$(top_builddir)/glx/libglx.la \
|
||||||
$(GLXDRI_LIBRARY)
|
$(GLXDRI_LIBRARY)
|
||||||
libglx_la_SOURCES = glxmodule.c
|
libglx_la_SOURCES = glxmodule.c
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ libdri_la_LTLIBRARIES = libdri.la
|
|||||||
libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
|
libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
|
||||||
-I$(top_srcdir)/hw/xfree86/os-support \
|
-I$(top_srcdir)/hw/xfree86/os-support \
|
||||||
-I$(top_srcdir)/hw/xfree86/os-support/bus \
|
-I$(top_srcdir)/hw/xfree86/os-support/bus \
|
||||||
-I$(top_srcdir)/GL/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
-I$(top_builddir)/GL/include \
|
-I$(top_builddir)/GL/include \
|
||||||
-I@MESA_SOURCE@/include \
|
-I@MESA_SOURCE@/include \
|
||||||
|
@ -22,7 +22,7 @@ AM_CFLAGS = \
|
|||||||
$(DIX_CFLAGS) \
|
$(DIX_CFLAGS) \
|
||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
-I$(top_srcdir)/GL/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
-I@MESA_SOURCE@/include \
|
-I@MESA_SOURCE@/include \
|
||||||
-I@MESA_SOURCE@/src/mesa/glapi \
|
-I@MESA_SOURCE@/src/mesa/glapi \
|
||||||
|
@ -11,7 +11,7 @@ SUBDIRS = \
|
|||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
-I$(srcdir)/.. \
|
-I$(srcdir)/.. \
|
||||||
-I$(srcdir)/../glxext \
|
-I$(srcdir)/../glxext \
|
||||||
-I$(top_srcdir)/GL/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
-I@MESA_SOURCE@/include \
|
-I@MESA_SOURCE@/include \
|
||||||
-I@MESA_SOURCE@/src/mesa/glapi \
|
-I@MESA_SOURCE@/src/mesa/glapi \
|
||||||
|
@ -5,7 +5,7 @@ AM_CFLAGS = \
|
|||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
$(XGLMODULES_CFLAGS) \
|
$(XGLMODULES_CFLAGS) \
|
||||||
-I$(top_srcdir)/GL/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
-I$(top_srcdir)/hw/xgl \
|
-I$(top_srcdir)/hw/xgl \
|
||||||
-I@MESA_SOURCE@/include \
|
-I@MESA_SOURCE@/include \
|
||||||
|
@ -7,7 +7,7 @@ AM_CFLAGS = \
|
|||||||
|
|
||||||
libglx_la_LDFLAGS = -avoid-version
|
libglx_la_LDFLAGS = -avoid-version
|
||||||
libglx_la_SOURCES = glxmodule.c
|
libglx_la_SOURCES = glxmodule.c
|
||||||
libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la
|
libglx_la_LIBADD = $(top_builddir)/glx/libglx.la
|
||||||
libglx_modules = libglx.la
|
libglx_modules = libglx.la
|
||||||
|
|
||||||
libglcore_la_LDFLAGS = -avoid-version
|
libglcore_la_LDFLAGS = -avoid-version
|
||||||
|
@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libCGLCore.la
|
|||||||
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_srcdir)/GL/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
-I$(top_srcdir)/GL/mesa/glapi \
|
-I$(top_srcdir)/GL/mesa/glapi \
|
||||||
-I$(top_srcdir)/hw/xquartz \
|
-I$(top_srcdir)/hw/xquartz \
|
||||||
|
Loading…
Reference in New Issue
Block a user