diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2008-04-18 17:47:01 +0300 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2008-04-23 18:11:55 +0300 |
| commit | dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e (patch) | |
| tree | c0340bc8573c61bee4e9bf01243923b77bc6a503 | |
| parent | 567d389d47dee233a973b101e04ce41c47a68f34 (diff) | |
glcore: drop GLcore (build system)
| -rw-r--r-- | GL/Makefile.am | 4 | ||||
| -rwxr-xr-x | GL/symlink-mesa.sh | 1 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 6 |
4 files changed, 4 insertions, 21 deletions
diff --git a/GL/Makefile.am b/GL/Makefile.am index 29d03f2d6..44fca18c5 100644 --- a/GL/Makefile.am +++ b/GL/Makefile.am @@ -2,8 +2,8 @@ if XQUARTZ XQUARTZ_SUBDIRS = apple endif -SUBDIRS = glx mesa $(XQUARTZ_SUBDIRS) -DIST_SUBDIRS = glx mesa apple +SUBDIRS = glx $(XQUARTZ_SUBDIRS) +DIST_SUBDIRS = glx apple WINDOWS_EXTRAS = \ windows/ChangeLog \ diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh index 47afdcd37..d611fcf37 100755 --- a/GL/symlink-mesa.sh +++ b/GL/symlink-mesa.sh @@ -267,7 +267,6 @@ run() { # $1 what to do # $2 explanation - ACTION=$1 EXPLANATION=$2 run_module mesa ACTION=$1 EXPLANATION=$2 run_module glx } diff --git a/configure.ac b/configure.ac index 5da56b575..aba4619b1 100644 --- a/configure.ac +++ b/configure.ac @@ -837,7 +837,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then PKG_CHECK_MODULES([GL], [glproto >= 1.4.9]) AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) - GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' + GLX_LIBS='$(top_builddir)/GL/glx/libglx.la' test -d GL || mkdir GL case $host_os in solaris*) @@ -2105,18 +2105,6 @@ Makefile GL/Makefile GL/apple/Makefile GL/glx/Makefile -GL/mesa/Makefile -GL/mesa/glapi/Makefile -GL/mesa/main/Makefile -GL/mesa/math/Makefile -GL/mesa/shader/Makefile -GL/mesa/shader/grammar/Makefile -GL/mesa/shader/slang/Makefile -GL/mesa/swrast/Makefile -GL/mesa/swrast_setup/Makefile -GL/mesa/tnl/Makefile -GL/mesa/vbo/Makefile -GL/mesa/X/Makefile include/Makefile afb/Makefile composite/Makefile diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 67967c52d..beff9b175 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la SUBDIRS = extmod if GLX -GLXMODS = libglx.la libGLcore.la +GLXMODS = libglx.la endif if XTRAP @@ -48,10 +48,6 @@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/GL/glx -libGLcore_la_LDFLAGS = -avoid-version -libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -libGLcore_la_SOURCES = GLcoremodule.c - libafb_la_LDFLAGS = -avoid-version libafb_la_LIBADD = $(top_builddir)/afb/libafb.la libafb_la_SOURCES = afbmodule.c |