identity: consolidate C sources list into Makefile.sources

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

5 files changed, 19 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index 1fbca0e68bb..f88a0eeabae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2004,6 +2004,7 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/drivers/freedreno/a2xx/Makefile
 		src/gallium/drivers/freedreno/a3xx/Makefile
 		src/gallium/drivers/i915/Makefile
+		src/gallium/drivers/identity/Makefile
 		src/gallium/drivers/ilo/Makefile
 		src/gallium/drivers/llvmpipe/Makefile
 		src/gallium/drivers/nouveau/Makefile
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 171d102dad8..c75fb82375d 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = $(VISIBILITY_CFLAGS)
 
 noinst_LTLIBRARIES =
 
-SUBDIRS = . trace rbug
+SUBDIRS = . identity trace rbug
 
 ################################################################################
 
@@ -24,15 +24,6 @@ galahad_libgalahad_la_SOURCES = \
 
 ################################################################################
 
-noinst_LTLIBRARIES += identity/libidentity.la
-
-identity_libidentity_la_SOURCES = \
-	identity/id_objects.c \
-	identity/id_context.c \
-	identity/id_screen.c
-
-################################################################################
-
 # Meta-driver which combines whichever software rasterizers have been
 # built into a single convenience library.
 
diff --git a/src/gallium/drivers/identity/Makefile.am b/src/gallium/drivers/identity/Makefile.am
new file mode 100644
index 00000000000..1caf3286a4c
--- /dev/null
+++ b/src/gallium/drivers/identity/Makefile.am
@@ -0,0 +1,11 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	$(GALLIUM_CFLAGS) \
+	$(VISIBILITY_CFLAGS)
+
+noinst_LTLIBRARIES = libidentity.la
+
+libidentity_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/identity/Makefile.sources b/src/gallium/drivers/identity/Makefile.sources
new file mode 100644
index 00000000000..14351e0e8d8
--- /dev/null
+++ b/src/gallium/drivers/identity/Makefile.sources
@@ -0,0 +1,4 @@
+C_SOURCES := \
+	id_objects.c \
+	id_context.c \
+	id_screen.c
diff --git a/src/gallium/drivers/identity/SConscript b/src/gallium/drivers/identity/SConscript
index d24d1ec7c61..120995143d2 100644
--- a/src/gallium/drivers/identity/SConscript
+++ b/src/gallium/drivers/identity/SConscript
@@ -4,11 +4,8 @@ env = env.Clone()
 
 identity = env.ConvenienceLibrary(
 	target = 'identity',
-	source = [
-		'id_context.c',
-		'id_objects.c',
-		'id_screen.c',
-	])
+	source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+	)
 
 env.Alias('identity', identity)