r600g: cleanup build include dirs and dependencies

The scons build still depended on libdrm_radeon.
2011-09-11 13:28:12 +02:00
parent fb5995cf53
commit 85f5d7ceee
6 changed files with 3 additions and 14 deletions
@@ -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

@@ -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
@@ -2,11 +2,8 @@ Import('*')

 env = env.Clone()

-env.PkgUseModules('DRM_RADEON')
-
 env.Append(CPPPATH = [
    '#/include',
-    '#/src/mesa',
 ])

 r600 = env.ConvenienceLibrary(
@@ -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

@@ -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

@@ -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(