# Directories
SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-
-
-# Directories
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = egl xdemos
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
# EGL directories
EGL_DRIVERS_DIRS = demo glx
-DRIVER_DIRS =
+DRIVER_DIRS = dri
WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
+GALLIUM_STATE_TRACKERS_DIRS = egl
-# gamma are missing because they have not been converted to use the new
-# interface.
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
+ savage sis tdfx unichrome ffb swrast
-# XXX: need to figure out a way for gallium and non-gallium builds to
-# coexist:
-#
+INTEL_LIBS = `pkg-config --libs libdrm_intel`
+INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
-#DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-# savage sis tdfx trident unichrome ffb
-DRI_DIRS = intel
+RADEON_LIBS = `pkg-config --libs libdrm_radeon`
+RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`