winsys/sw: automake: consistently use Makefile.sources

 - Include the headers within.
 - Update scons to use them.
 - Drop useless include (gallium/drivers) from scons.

Signed-off-by: Emil Velikov <[email protected]>

3 files changed, 6 insertions, 5 deletions

diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.am b/src/gallium/winsys/sw/kms-dri/Makefile.am
index cb3b61deea6..8162553289d 100644
--- a/src/gallium/winsys/sw/kms-dri/Makefile.am
+++ b/src/gallium/winsys/sw/kms-dri/Makefile.am
@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -29,4 +30,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libswkmsdri.la
 
-libswkmsdri_la_SOURCES = kms_dri_sw_winsys.c
+libswkmsdri_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.sources b/src/gallium/winsys/sw/kms-dri/Makefile.sources
new file mode 100644
index 00000000000..4bf832bdb80
--- /dev/null
+++ b/src/gallium/winsys/sw/kms-dri/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	kms_dri_sw_winsys.c \
+	kms_dri_sw_winsys.h
diff --git a/src/gallium/winsys/sw/kms-dri/SConscript b/src/gallium/winsys/sw/kms-dri/SConscript
index 0a6c335cbd7..e7dd721dd13 100644
--- a/src/gallium/winsys/sw/kms-dri/SConscript
+++ b/src/gallium/winsys/sw/kms-dri/SConscript
@@ -12,15 +12,12 @@ env = env.Clone()
 env.PkgUseModules('DRM')
 
 env.Append(CPPPATH = [
-#    'include',
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
 ])
 
 ws_kms_dri = env.ConvenienceLibrary(
     target = 'ws_kms_dri',
-    source = [
-       'kms_dri_sw_winsys.c',
-    ]
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
 )
 Export('ws_kms_dri')