4 files changed, 23 insertions, 25 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 3f7621d601b..f8baa3cf92c 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -1,26 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(DEFINES)
 
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-
-noinst_LTLIBRARIES =
-
-SUBDIRS = . identity noop trace rbug
-
-################################################################################
-
-noinst_LTLIBRARIES += galahad/libgalahad.la
-
-galahad_libgalahad_la_SOURCES = \
-	galahad/glhd_objects.c \
-	galahad/glhd_context.c \
-	galahad/glhd_screen.c
+SUBDIRS = . galahad identity noop trace rbug
 
 ################################################################################
 
diff --git a/src/gallium/drivers/galahad/Makefile.am b/src/gallium/drivers/galahad/Makefile.am
new file mode 100644
index 00000000000..5f64b93ceaf
--- /dev/null
+++ b/src/gallium/drivers/galahad/Makefile.am
@@ -0,0 +1,16 @@
+################################################################################
+
+# Meta-driver which combines whichever software rasterizers have been
+# built into a single convenience library.
+
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	$(GALLIUM_CFLAGS) \
+	$(VISIBILITY_CFLAGS)
+
+noinst_LTLIBRARIES = libgalahad.la
+
+libgalahad_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/galahad/Makefile.sources b/src/gallium/drivers/galahad/Makefile.sources
new file mode 100644
index 00000000000..f6c7f4b88b8
--- /dev/null
+++ b/src/gallium/drivers/galahad/Makefile.sources
@@ -0,0 +1,4 @@
+C_SOURCES := \
+	glhd_objects.c \
+	glhd_context.c \
+	glhd_screen.c
diff --git a/src/gallium/drivers/galahad/SConscript b/src/gallium/drivers/galahad/SConscript
index 3f39f99e517..b1d31e4b481 100644
--- a/src/gallium/drivers/galahad/SConscript
+++ b/src/gallium/drivers/galahad/SConscript
@@ -4,11 +4,8 @@ env = env.Clone()
 
 galahad = env.ConvenienceLibrary(
 	target = 'galahad',
-	source = [
-		'glhd_context.c',
-		'glhd_objects.c',
-		'glhd_screen.c',
-	])
+	source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+	)
 
 env.Alias('galahad', galahad)