From a402c876a465904ac71ebf39af67ea451b2457dc Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 20 Aug 2005 18:11:17 +0000 Subject: [PATCH] Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh in our builddir, not our srcdir. --- ChangeLog | 6 ++++++ GL/mesa/X/Makefile.am | 20 ++++++++++---------- GL/mesa/array_cache/Makefile.am | 20 ++++++++++---------- GL/mesa/glapi/Makefile.am | 20 ++++++++++---------- GL/mesa/main/Makefile.am | 20 ++++++++++---------- GL/mesa/math/Makefile.am | 20 ++++++++++---------- GL/mesa/shader/Makefile.am | 24 ++++++++++++------------ GL/mesa/shader/grammar/Makefile.am | 20 ++++++++++---------- GL/mesa/shader/slang/Makefile.am | 22 +++++++++++----------- GL/mesa/swrast/Makefile.am | 20 ++++++++++---------- GL/mesa/swrast_setup/Makefile.am | 20 ++++++++++---------- GL/mesa/tnl/Makefile.am | 20 ++++++++++---------- configure.ac | 12 +++++++----- hw/dmx/glxProxy/Makefile.am | 2 ++ hw/xfree86/dri/Makefile.am | 2 ++ 15 files changed, 130 insertions(+), 118 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16c16ead5..c987c8257 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,12 @@ build libxorggxkb.la from within the Xorg DDX to replace the previous xf86VT.o, et al, hacks. + * configure.ac: + * GL/**/Makefile.am: + * hw/xfree86/dri/Makefile.am: + Make DRI/GLcore builds srcdir != builddir safe, and invoke + symlink-mesa.sh in our builddir, not our srcdir. + 2005-08-19 Søren Sandmann * fb/Makefile.am (libfbmmx_la_CFLAGS): Move fbmmx to a convenience diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index 129ab825c..4d5b8daeb 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -1,16 +1,16 @@ noinst_LTLIBRARIES = libX.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. \ -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index 506cad714..318941c56 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -1,15 +1,15 @@ noinst_LTLIBRARIES = libac.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libac_la_SOURCES = ac_context.c ac_import.c diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am index 02f7e8951..5deb565a7 100644 --- a/GL/mesa/glapi/Makefile.am +++ b/GL/mesa/glapi/Makefile.am @@ -1,15 +1,15 @@ noinst_LTLIBRARIES = libglapi.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libglapi_la_SOURCES = glapi.c glthread.c diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index f7a0af291..fe62ff980 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -1,16 +1,16 @@ noinst_LTLIBRARIES = libmain.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. if NEED_VSNPRINTF VSNPRINTF_SOURCES = vsnprintf.c diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am index 6661e944d..0f770032e 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -1,16 +1,16 @@ noinst_LTLIBRARIES = libmath.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libmath_la_SOURCES = m_debug_clip.c \ m_debug_norm.c \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index 886a08512..7827416ae 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -3,18 +3,18 @@ SUBDIRS = grammar slang noinst_LTLIBRARIES = libshader.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../shader/grammar \ - -I$(srcdir)/../shader/slang \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../shader/grammar \ + -I../shader/slang \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libshader_la_SOURCES = arbfragparse.c \ arbprogparse.c \ diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am index 25c84e5b9..2c97d0bc2 100644 --- a/GL/mesa/shader/grammar/Makefile.am +++ b/GL/mesa/shader/grammar/Makefile.am @@ -1,15 +1,15 @@ noinst_LTLIBRARIES = libgrammar.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../../X \ - -I$(srcdir)/../../array_cache \ - -I$(srcdir)/../../glapi \ - -I$(srcdir)/../../main \ - -I$(srcdir)/../../math \ - -I$(srcdir)/../../shader \ - -I$(srcdir)/../../swrast \ - -I$(srcdir)/../../swrast_setup \ - -I$(srcdir)/../../tnl \ - -I$(srcdir)/../.. + -I../../X \ + -I../../array_cache \ + -I../../glapi \ + -I../../main \ + -I../../math \ + -I../../shader \ + -I../../swrast \ + -I../../swrast_setup \ + -I../../tnl \ + -I../.. nodist_libgrammar_la_SOURCES = grammar_mesa.c diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 19b6c249f..8d0430399 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -1,17 +1,17 @@ noinst_LTLIBRARIES = libslang.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../grammar \ - -I$(srcdir)/../../X \ - -I$(srcdir)/../../array_cache \ - -I$(srcdir)/../../glapi \ - -I$(srcdir)/../../main \ - -I$(srcdir)/../../math \ - -I$(srcdir)/../../shader \ - -I$(srcdir)/../../swrast \ - -I$(srcdir)/../../swrast_setup \ - -I$(srcdir)/../../tnl \ - -I$(srcdir)/../.. + -I../grammar \ + -I../../X \ + -I../../array_cache \ + -I../../glapi \ + -I../../main \ + -I../../math \ + -I../../shader \ + -I../../swrast \ + -I../../swrast_setup \ + -I../../tnl \ + -I../.. nodist_libslang_la_SOURCES = slang_assemble_assignment.c \ slang_assemble.c \ diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index b18157432..b92786d2d 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -1,16 +1,16 @@ noinst_LTLIBRARIES = libswrast.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libswrast_la_SOURCES = s_aaline.c \ s_aatriangle.c \ diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index 40e6edb17..b40dfdcdf 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -1,15 +1,15 @@ noinst_LTLIBRARIES = libss.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libss_la_SOURCES = ss_context.c ss_triangle.c diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index 02d2c4d5f..caf02c4b1 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -1,16 +1,16 @@ noinst_LTLIBRARIES = libtnl.la INCLUDES = -I@MESA_SOURCE@/include \ - -I$(srcdir)/../X \ - -I$(srcdir)/../array_cache \ - -I$(srcdir)/../glapi \ - -I$(srcdir)/../main \ - -I$(srcdir)/../math \ - -I$(srcdir)/../shader \ - -I$(srcdir)/../swrast \ - -I$(srcdir)/../swrast_setup \ - -I$(srcdir)/../tnl \ - -I$(srcdir)/.. + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. nodist_libtnl_la_SOURCES = t_array_api.c \ t_array_import.c \ diff --git a/configure.ac b/configure.ac index b57f11f41..1d687bf8f 100644 --- a/configure.ac +++ b/configure.ac @@ -465,6 +465,7 @@ if test "$GLX" = yes -a x$MESA_SOURCE != x; then AC_DEFINE(GLXEXT,1,[Build GLX extension]) GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' dnl EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/glx' + test -d GL || mkdir GL $srcdir/GL/symlink-mesa.sh $MESA_SOURCE GL/ else GLX=no @@ -651,6 +652,7 @@ SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' LAYER_LIB='$(top_builddir)/miext/layer/liblayer.la' XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la' XKB_LIB='$(top_builddir)/xkb/libxkb.la' +XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' XI_LIB='$(top_builddir)/Xi/libXi.la' XI_INC='-I$(top_srcdir)/Xi' CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' @@ -660,11 +662,11 @@ XSERVER_LIBS="${XSERVER_LIBS} -lm -lz" XORG_CORE_LIBS="$DIX_LIB" XORG_LIBS="$MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $XPSTUBS_LIB $OS_LIB" -XVFB_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB" -XNEST_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB" -XWIN_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB" -XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $EXTENSION_LIBS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB" -XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $DAMAGE_LIB" +XVFB_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB" +XNEST_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB" +XWIN_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB" +XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $EXTENSION_LIBS $XI_LIB $XKB_LIB $XKB_STUB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB" +XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $DAMAGE_LIB" XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index 14e0fbd9f..78fe186c1 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -34,5 +34,7 @@ libglxproxy_a_SOURCES = compsize.c \ AM_CFLAGS = -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/include \ -I$(top_srcdir)/GL/include \ + -I$(top_builddir)/GL/include \ + -I@MESA_SOURCE@/include \ -DHAVE_DMX_CONFIG_H \ @DMXMODULES_CFLAGS@ diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 9b4cf4e11..737930329 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -4,6 +4,8 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include \ + -I$(top_builddir)/GL/include \ + -I@MESA_SOURCE@/include \ -DHAVE_XORG_CONFIG_H \ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@