galahad: consolidate C sources list into Makefile.sources

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/configure.ac b/configure.ac
index 899f20fc0543ed311d345626ca37300a7d433c93..8ccbc287025176704fbd59d4a5c1d1945389c826 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2003,6 +2003,7 @@ AC_CONFIG_FILES([Makefile
                src/gallium/drivers/freedreno/Makefile
                src/gallium/drivers/freedreno/a2xx/Makefile
                src/gallium/drivers/freedreno/a3xx/Makefile
+               src/gallium/drivers/galahad/Makefile
                src/gallium/drivers/i915/Makefile
                src/gallium/drivers/identity/Makefile
                src/gallium/drivers/ilo/Makefile

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 3f7621d601b662db84c9c1dbfbba027e8e11cf0f..f8baa3cf92c4a23249827603eefbef32a426d74b 100644 (file)
--- 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 (file)
index 0000000..5f64b93
--- /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 (file)
index 0000000..f6c7f4b
--- /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 3f39f99e517d50d2066806e058ead5193449685c..b1d31e4b481df34094a3c79192e882ff91f3e801 100644 (file)
--- 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)