Move GL/glx on level up now that it's the only thing left under GL.
This commit is contained in:
parent
a8a9b40e55
commit
c3eb5b80d8
|
@ -1,9 +0,0 @@
|
|||
SUBDIRS = glx
|
||||
|
||||
WINDOWS_EXTRAS = \
|
||||
windows/ChangeLog \
|
||||
windows/glwindows.h \
|
||||
windows/glwrap.c \
|
||||
windows/indirect.c
|
||||
|
||||
EXTRA_DIST = symlink-mesa.sh $(WINDOWS_EXTRAS)
|
|
@ -18,7 +18,7 @@ MFB_DIR=mfb
|
|||
endif
|
||||
|
||||
if GLX
|
||||
GLX_DIR=GL
|
||||
GLX_DIR=glx
|
||||
endif
|
||||
|
||||
if DBE
|
||||
|
@ -94,7 +94,7 @@ DIST_SUBDIRS = \
|
|||
damageext \
|
||||
XTrap \
|
||||
composite \
|
||||
GL \
|
||||
glx \
|
||||
exa \
|
||||
config \
|
||||
hw
|
||||
|
|
|
@ -856,7 +856,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
|
|||
PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0])
|
||||
AC_SUBST(XLIB_CFLAGS)
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la'
|
||||
GLX_LIBS='$(top_builddir)/glx/libglx.la'
|
||||
GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
|
||||
else
|
||||
GLX=no
|
||||
|
@ -1664,7 +1664,7 @@ if test "x$XQUARTZ" = xyes; then
|
|||
AC_DEFINE(XQUARTZ,1,[Have Quartz])
|
||||
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
|
||||
|
||||
DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/GL/glx/libglx.la'
|
||||
DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/glx/libglx.la'
|
||||
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
|
||||
AC_SUBST([DARWIN_LIBS])
|
||||
|
||||
|
@ -1990,8 +1990,7 @@ XORG_MANPAGE_SECTIONS
|
|||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
GL/Makefile
|
||||
GL/glx/Makefile
|
||||
glx/Makefile
|
||||
include/Makefile
|
||||
afb/Makefile
|
||||
composite/Makefile
|
||||
|
|
Loading…
Reference in New Issue
Block a user