r600g: cleanup build include dirs and dependencies

The scons build still depended on libdrm_radeon.

diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index 994ae07789cc1673da1dd9d297266422c20c5cb1..f060920d5d7156c60b9518c5fb1903440e15f03e 100644 (file)
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -32,9 +32,7 @@ LOCAL_SRC_FILES := $(C_SOURCES)
 
 LOCAL_CFLAGS := -std=c99
 
-LOCAL_C_INCLUDES := \
-       $(DRM_TOP) \
-       $(DRM_TOP)/include/drm
+LOCAL_C_INCLUDES :=
 
 LOCAL_MODULE := libmesa_pipe_r600
 

diff --git a/src/gallium/drivers/r600/Makefile b/src/gallium/drivers/r600/Makefile
index 0e68fe99345f73cfe97f1f2dc589acdfeb0e7a8e..80f8cbfc80331a6b04919866d3672cd4061c7e24 100644 (file)
--- a/src/gallium/drivers/r600/Makefile
+++ b/src/gallium/drivers/r600/Makefile
@@ -3,8 +3,7 @@ include $(TOP)/configs/current
 
 LIBNAME = r600
 
-LIBRARY_INCLUDES = \
-       $(shell pkg-config libdrm --cflags-only-I)
+LIBRARY_INCLUDES = -I$(TOP)/include
 
 # get C_SOURCES
 include Makefile.sources

diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index be12255e4d08666e342290e01d479f76ce0630d2..e400c38b46ee044623bb855727e38096c80f86d6 100644 (file)
--- a/src/gallium/drivers/r600/SConscript
+++ b/src/gallium/drivers/r600/SConscript
@@ -2,11 +2,8 @@ Import('*')
 
 env = env.Clone()
 
-env.PkgUseModules('DRM_RADEON')
-
 env.Append(CPPPATH = [
     '#/include',
-    '#/src/mesa',
 ])
 
 r600 = env.ConvenienceLibrary(

diff --git a/src/gallium/winsys/r600/drm/Android.mk b/src/gallium/winsys/r600/drm/Android.mk
index eb79caa19ca4d403fba4edd7f688c8ff619e7ff6..b1c0ab684bba0eb09c8183b60e89b5abf8c6e9a1 100644 (file)
--- a/src/gallium/winsys/r600/drm/Android.mk
+++ b/src/gallium/winsys/r600/drm/Android.mk
@@ -33,9 +33,7 @@ LOCAL_SRC_FILES := $(C_SOURCES)
 LOCAL_CFLAGS := -std=c99
 
 LOCAL_C_INCLUDES := \
-       $(GALLIUM_TOP)/drivers/r600 \
-       $(DRM_TOP) \
-       $(DRM_TOP)/include/drm
+       $(GALLIUM_TOP)/drivers/r600
 
 LOCAL_MODULE := libmesa_winsys_r600
 

diff --git a/src/gallium/winsys/r600/drm/Makefile b/src/gallium/winsys/r600/drm/Makefile
index c23286c81972765588953b4859c63a73b75e6043..ccaab0b41704529e376962a4603ee2468f7aeced 100644 (file)
--- a/src/gallium/winsys/r600/drm/Makefile
+++ b/src/gallium/winsys/r600/drm/Makefile
@@ -9,7 +9,6 @@ include Makefile.sources
 
 LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/r600 \
                   -I$(TOP)/include \
-                  $(shell pkg-config libdrm --cflags-only-I)
 
 include ../../../Makefile.template
 

diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript
index 2d0d80e8bb9f3980a277fb5ab805da5905467684..cbefd25e2891f991c1859aaaff629a23a44f58a3 100644 (file)
--- a/src/gallium/winsys/r600/drm/SConscript
+++ b/src/gallium/winsys/r600/drm/SConscript
@@ -4,8 +4,6 @@ env = env.Clone()
 
 r600_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
 
-env.PkgUseModules('DRM_RADEON')
-
 env.Append(CPPPATH = '#/src/gallium/drivers/r600')
 
 r600winsys = env.ConvenienceLibrary(