targets/dri-swrast: use drm aware dricommon when building more than swrast

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>

src/gallium/targets/dri-swrast/Makefile.am

@@ -23,29 +23,22 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-	$(EXPAT_CFLAGS) \
 	$(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/winsys/sw/dri \
-	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	-DGALLIUM_RBUG \
 	-DGALLIUM_TRACE \
-	-DGALLIUM_SOFTPIPE \
-	-D__NOT_HAVE_DRM_H
+	-DGALLIUM_SOFTPIPE
 
 dridir = $(DRI_DRIVER_INSTALL_DIR)
 dri_LTLIBRARIES = swrast_dri.la
 
 nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp
-swrast_dri_la_SOURCES = \
-	swrast_drm_api.c \
-	$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
-	$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
-	$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
+swrast_dri_la_SOURCES = swrast_drm_api.c
 
 swrast_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 swrast_dri_la_LIBADD = \
+	$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
 	$(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
 	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \

src/gallium/targets/dri-swrast/SConscript

@@ -2,10 +2,6 @@ Import('*')
 
 env = driswenv.Clone()
 
-env.Append(CPPPATH = [
-    '#/src/gallium/winsys/sw/dri',
-])
-
 env.Prepend(LIBS = [
     st_drisw,
     ws_dri,

src/gallium/targets/dri-swrast/swrast_drm_api.c

@@ -28,12 +28,12 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_memory.h"
-#include "dri_sw_winsys.h"
 
 #include "target-helpers/inline_debug_helper.h"
 #include "target-helpers/inline_sw_helper.h"
 
 #include "state_tracker/drm_driver.h"
+#include "sw/dri/dri_sw_winsys.h"
 
 DRM_DRIVER_DESCRIPTOR("swrast", NULL, NULL, NULL);