summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/default2
-rw-r--r--src/glx/mini/Makefile2
-rw-r--r--src/mesa/drivers/dri/fb/Makefile2
-rw-r--r--src/mesa/drivers/dri/gamma/Makefile2
-rw-r--r--src/mesa/drivers/dri/i810/Makefile2
-rw-r--r--src/mesa/drivers/dri/i830/Makefile2
-rw-r--r--src/mesa/drivers/dri/mach64/Makefile2
-rw-r--r--src/mesa/drivers/dri/mga/Makefile2
-rw-r--r--src/mesa/drivers/dri/r128/Makefile2
-rw-r--r--src/mesa/drivers/dri/r200/Makefile2
-rw-r--r--src/mesa/drivers/dri/radeon/Makefile2
-rw-r--r--src/mesa/drivers/dri/sis/Makefile2
-rw-r--r--src/mesa/drivers/dri/tdfx/Makefile2
-rw-r--r--src/mesa/drivers/dri/unichrome/Makefile2
14 files changed, 15 insertions, 13 deletions
diff --git a/configs/default b/configs/default
index e38a0a0945..8c005bf48b 100644
--- a/configs/default
+++ b/configs/default
@@ -10,6 +10,8 @@ MESA_MAJOR=6
MESA_MINOR=1
MESA_TINY=0
+# external projects
+DRM_SOURCE_PATH=/home/dri/drm
# Compiler and flags
CC = cc
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index c8ed541c35..3c1c54a641 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -26,7 +26,7 @@ INCLUDE_DIRS = \
-I$(TOP)/src/mesa/transform \
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared
+ -I$(DRM_SOURCE_PATH)/shared
##### RULES #####
diff --git a/src/mesa/drivers/dri/fb/Makefile b/src/mesa/drivers/dri/fb/Makefile
index 6d292aa3e0..a50aa0cb45 100644
--- a/src/mesa/drivers/dri/fb/Makefile
+++ b/src/mesa/drivers/dri/fb/Makefile
@@ -19,7 +19,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/gamma/Makefile b/src/mesa/drivers/dri/gamma/Makefile
index 0b5a6c8a5b..1dcd922a43 100644
--- a/src/mesa/drivers/dri/gamma/Makefile
+++ b/src/mesa/drivers/dri/gamma/Makefile
@@ -53,7 +53,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/i810/Makefile b/src/mesa/drivers/dri/i810/Makefile
index 51299cf401..ab7873a2bc 100644
--- a/src/mesa/drivers/dri/i810/Makefile
+++ b/src/mesa/drivers/dri/i810/Makefile
@@ -50,7 +50,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/i830/Makefile b/src/mesa/drivers/dri/i830/Makefile
index a857814a78..4f07b4cdde 100644
--- a/src/mesa/drivers/dri/i830/Makefile
+++ b/src/mesa/drivers/dri/i830/Makefile
@@ -51,7 +51,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/mach64/Makefile b/src/mesa/drivers/dri/mach64/Makefile
index e9ea1c1fee..77cc9420bf 100644
--- a/src/mesa/drivers/dri/mach64/Makefile
+++ b/src/mesa/drivers/dri/mach64/Makefile
@@ -52,7 +52,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/mga/Makefile b/src/mesa/drivers/dri/mga/Makefile
index 7d9745248d..249d810e0c 100644
--- a/src/mesa/drivers/dri/mga/Makefile
+++ b/src/mesa/drivers/dri/mga/Makefile
@@ -55,7 +55,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/r128/Makefile b/src/mesa/drivers/dri/r128/Makefile
index edd6803b89..2043498701 100644
--- a/src/mesa/drivers/dri/r128/Makefile
+++ b/src/mesa/drivers/dri/r128/Makefile
@@ -51,7 +51,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index b3d7955656..7a3b248c0c 100644
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -57,7 +57,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index cbc21e45a8..d5717a63a1 100644
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -91,7 +91,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/sis/Makefile b/src/mesa/drivers/dri/sis/Makefile
index 375fc9b26d..0ecc6e56e0 100644
--- a/src/mesa/drivers/dri/sis/Makefile
+++ b/src/mesa/drivers/dri/sis/Makefile
@@ -54,7 +54,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/tdfx/Makefile b/src/mesa/drivers/dri/tdfx/Makefile
index fbe2d44596..ddbbc416bc 100644
--- a/src/mesa/drivers/dri/tdfx/Makefile
+++ b/src/mesa/drivers/dri/tdfx/Makefile
@@ -53,7 +53,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
diff --git a/src/mesa/drivers/dri/unichrome/Makefile b/src/mesa/drivers/dri/unichrome/Makefile
index 95540e1c67..1af4f23af1 100644
--- a/src/mesa/drivers/dri/unichrome/Makefile
+++ b/src/mesa/drivers/dri/unichrome/Makefile
@@ -52,7 +52,7 @@ INCLUDE_DIRS = \
-Iserver \
-I$(TOP)/src/glx/mini \
-I$(TOP)/include \
- -I$(TOP)/src/mesa/drivers/dri/drm/shared \
+ -I$(DRM_SOURCE_PATH)\shared \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \