aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--src/gallium/targets/Makefile.dri (renamed from src/gallium/winsys/drm/Makefile.template)0
-rw-r--r--src/gallium/targets/dri-i915/Makefile (renamed from src/gallium/winsys/drm/intel/dri/Makefile)10
-rw-r--r--src/gallium/targets/dri-i915/SConscript (renamed from src/gallium/winsys/drm/intel/dri/SConscript)0
-rw-r--r--src/gallium/targets/dri-i965/Makefile (renamed from src/gallium/winsys/drm/i965/dri/Makefile)10
-rw-r--r--src/gallium/targets/dri-i965/SConscript (renamed from src/gallium/winsys/drm/i965/dri/SConscript)0
-rw-r--r--src/gallium/targets/dri-nouveau/Makefile (renamed from src/gallium/winsys/drm/nouveau/dri/Makefile)6
-rw-r--r--src/gallium/targets/dri-radeong/Makefile (renamed from src/gallium/winsys/drm/radeon/dri/Makefile)7
-rw-r--r--src/gallium/targets/dri-radeong/SConscript (renamed from src/gallium/winsys/drm/radeon/dri/SConscript)0
-rw-r--r--src/gallium/targets/dri-vmwgfx/Makefile (renamed from src/gallium/winsys/drm/vmware/dri/Makefile)5
-rw-r--r--src/gallium/targets/dri-vmwgfx/SConscript (renamed from src/gallium/winsys/drm/vmware/dri/SConscript)0
-rw-r--r--src/gallium/winsys/drm/i965/SConscript4
-rw-r--r--src/gallium/winsys/drm/intel/SConscript4
-rw-r--r--src/gallium/winsys/drm/radeon/SConscript4
-rw-r--r--src/gallium/winsys/drm/vmware/SConscript4
15 files changed, 17 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac
index aab16b6ea8a..51b480ff972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1180,7 +1180,7 @@ AC_ARG_ENABLE([gallium],
[enable_gallium="$enableval"],
[enable_gallium=yes])
if test "x$enable_gallium" = xyes; then
- SRC_DIRS="$SRC_DIRS gallium gallium/winsys"
+ SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
fi
dnl
@@ -1318,6 +1318,7 @@ AC_ARG_ENABLE([gallium-svga],
if test "x$enable_gallium_svga" = xyes; then
if test "x$mesa_driver" = xdri; then
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/vmware"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-vmwgfx"
fi
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
elif test "x$enable_gallium_svga" = xauto; then
@@ -1335,6 +1336,7 @@ AC_ARG_ENABLE([gallium-intel],
if test "x$enable_gallium_intel" = xyes; then
if test "x$mesa_driver" = xdri; then
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/intel drm/i965"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-i915 dri-i965"
fi
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
elif test "x$enable_gallium_intel" = xauto; then
@@ -1352,6 +1354,7 @@ AC_ARG_ENABLE([gallium-radeon],
if test "x$enable_gallium_radeon" = xyes; then
if test "x$mesa_driver" = xdri; then
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/radeon"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-radeong"
fi
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
elif test "x$enable_gallium_radeon" = xauto; then
@@ -1369,6 +1372,7 @@ AC_ARG_ENABLE([gallium-nouveau],
if test "x$enable_gallium_nouveau" = xyes; then
if test "x$mesa_driver" = xdri; then
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/nouveau"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-nouveau"
fi
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50"
fi
diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/targets/Makefile.dri
index 6d9b81aa249..6d9b81aa249 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/targets/Makefile.dri
diff --git a/src/gallium/winsys/drm/intel/dri/Makefile b/src/gallium/targets/dri-i915/Makefile
index 26aae4122eb..33eaae624f2 100644
--- a/src/gallium/winsys/drm/intel/dri/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = i915_dri.so
@@ -11,16 +11,12 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/identity/libidentity.a \
$(TOP)/src/gallium/drivers/i915/libi915.a
-
-DRIVER_SOURCES =
-
C_SOURCES = \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
-include ../../Makefile.template
+include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_intel
-symlinks: $(TOP)/$(LIB_DIR)/gallium
- @rm -f $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
+symlinks:
diff --git a/src/gallium/winsys/drm/intel/dri/SConscript b/src/gallium/targets/dri-i915/SConscript
index 0df841d8798..0df841d8798 100644
--- a/src/gallium/winsys/drm/intel/dri/SConscript
+++ b/src/gallium/targets/dri-i915/SConscript
diff --git a/src/gallium/winsys/drm/i965/dri/Makefile b/src/gallium/targets/dri-i965/Makefile
index 56690769fc7..e17775a842a 100644
--- a/src/gallium/winsys/drm/i965/dri/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = i965_dri.so
@@ -12,16 +12,12 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/identity/libidentity.a \
$(TOP)/src/gallium/drivers/i965/libi965.a
-
-DRIVER_SOURCES =
-
C_SOURCES = \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
-include ../../Makefile.template
+include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_intel
-symlinks: $(TOP)/$(LIB_DIR)/gallium
- @rm -f $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
+symlinks:
diff --git a/src/gallium/winsys/drm/i965/dri/SConscript b/src/gallium/targets/dri-i965/SConscript
index a99533fd245..a99533fd245 100644
--- a/src/gallium/winsys/drm/i965/dri/SConscript
+++ b/src/gallium/targets/dri-i965/SConscript
diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index 50ac3f203e5..680bad79177 100644
--- a/src/gallium/winsys/drm/nouveau/dri/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = nouveau_dri.so
@@ -10,13 +10,11 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
-DRIVER_SOURCES =
-
C_SOURCES = \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
-include ../../Makefile.template
+include ../Makefile.dri
DRI_LIB_DEPS += $(shell pkg-config libdrm_nouveau --libs)
diff --git a/src/gallium/winsys/drm/radeon/dri/Makefile b/src/gallium/targets/dri-radeong/Makefile
index d75f7dd6da7..c6d8c524694 100644
--- a/src/gallium/winsys/drm/radeon/dri/Makefile
+++ b/src/gallium/targets/dri-radeong/Makefile
@@ -1,5 +1,4 @@
-
-TOP = ../../../../../..
+TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = radeong_dri.so
@@ -15,9 +14,7 @@ C_SOURCES = \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
-ASM_SOURCES =
-
-include ../../Makefile.template
+include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_radeon
diff --git a/src/gallium/winsys/drm/radeon/dri/SConscript b/src/gallium/targets/dri-radeong/SConscript
index c4989d1b595..c4989d1b595 100644
--- a/src/gallium/winsys/drm/radeon/dri/SConscript
+++ b/src/gallium/targets/dri-radeong/SConscript
diff --git a/src/gallium/winsys/drm/vmware/dri/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile
index 8a39e23da6d..1d2ddfe548f 100644
--- a/src/gallium/winsys/drm/vmware/dri/Makefile
+++ b/src/gallium/targets/dri-vmwgfx/Makefile
@@ -1,5 +1,4 @@
-
-TOP = ../../../../../..
+TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = vmwgfx_dri.so
@@ -13,6 +12,6 @@ PIPE_DRIVERS = \
C_SOURCES = \
$(COMMON_GALLIUM_SOURCES)
-include ../../Makefile.template
+include ../Makefile.dri
symlinks:
diff --git a/src/gallium/winsys/drm/vmware/dri/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript
index d26d0cd7483..d26d0cd7483 100644
--- a/src/gallium/winsys/drm/vmware/dri/SConscript
+++ b/src/gallium/targets/dri-vmwgfx/SConscript
diff --git a/src/gallium/winsys/drm/i965/SConscript b/src/gallium/winsys/drm/i965/SConscript
index 50d7b75ed68..fdf57eedb94 100644
--- a/src/gallium/winsys/drm/i965/SConscript
+++ b/src/gallium/winsys/drm/i965/SConscript
@@ -1,7 +1,3 @@
Import('*')
SConscript(['gem/SConscript',])
-
-if 'mesa' in env['statetrackers']:
-
- SConscript(['dri/SConscript'])
diff --git a/src/gallium/winsys/drm/intel/SConscript b/src/gallium/winsys/drm/intel/SConscript
index 50d7b75ed68..fdf57eedb94 100644
--- a/src/gallium/winsys/drm/intel/SConscript
+++ b/src/gallium/winsys/drm/intel/SConscript
@@ -1,7 +1,3 @@
Import('*')
SConscript(['gem/SConscript',])
-
-if 'mesa' in env['statetrackers']:
-
- SConscript(['dri/SConscript'])
diff --git a/src/gallium/winsys/drm/radeon/SConscript b/src/gallium/winsys/drm/radeon/SConscript
index b2dfd504d42..eff87e7d010 100644
--- a/src/gallium/winsys/drm/radeon/SConscript
+++ b/src/gallium/winsys/drm/radeon/SConscript
@@ -1,7 +1,3 @@
Import('*')
SConscript(['core/SConscript',])
-
-if 'mesa' in env['statetrackers']:
-
- SConscript(['dri/SConscript'])
diff --git a/src/gallium/winsys/drm/vmware/SConscript b/src/gallium/winsys/drm/vmware/SConscript
index 06e6d5be9ca..e4da31a6933 100644
--- a/src/gallium/winsys/drm/vmware/SConscript
+++ b/src/gallium/winsys/drm/vmware/SConscript
@@ -2,10 +2,6 @@ Import('*')
SConscript(['core/SConscript',])
-if 'mesa' in env['statetrackers']:
-
- SConscript(['dri/SConscript'])
-
if 'xorg' in env['statetrackers']:
SConscript(['xorg/SConscript'])