[Mesa-dev] [PATCH 20/21] freedreno: One Makefile.am with a Makefile.sources is enough.

[Johannes Obermayr]

---
 configure.ac                                   |  2 --
 src/gallium/drivers/freedreno/Makefile.am      | 18 +++--------
 src/gallium/drivers/freedreno/Makefile.sources | 43 ++++++++++++++++++++++++++
 src/gallium/drivers/freedreno/a2xx/Makefile.am | 27 ----------------
 src/gallium/drivers/freedreno/a3xx/Makefile.am | 27 ----------------
 5 files changed, 47 insertions(+), 70 deletions(-)
 create mode 100644 src/gallium/drivers/freedreno/Makefile.sources
 delete mode 100644 src/gallium/drivers/freedreno/a2xx/Makefile.am
 delete mode 100644 src/gallium/drivers/freedreno/a3xx/Makefile.am

diff --git a/configure.ac b/configure.ac
index c600051..2381cf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2006,8 +2006,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/auxiliary/pipe-loader/Makefile
 		src/gallium/drivers/Makefile
 		src/gallium/drivers/freedreno/Makefile
-		src/gallium/drivers/freedreno/a2xx/Makefile
-		src/gallium/drivers/freedreno/a3xx/Makefile
 		src/gallium/drivers/i915/Makefile
 		src/gallium/drivers/ilo/Makefile
 		src/gallium/drivers/llvmpipe/Makefile
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 414eed5..7ce3620 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -1,3 +1,4 @@
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 mesalib_LTLIBRARIES = libfreedreno.la
@@ -11,25 +12,14 @@ AM_CFLAGS = \
 	$(FREEDRENO_CFLAGS) \
 	$(VISIBILITY_CFLAGS)
 
-SUBDIRS = a2xx a3xx
-
 libfreedreno_la_LDFLAGS = \
 	-Wl,--no-undefined -shared -avoid-version
 
 libfreedreno_la_SOURCES = \
-	freedreno_util.c \
-	freedreno_fence.c \
-	freedreno_resource.c \
-	freedreno_surface.c \
-	freedreno_draw.c \
-	freedreno_state.c \
-	freedreno_texture.c \
-	freedreno_context.c \
-	freedreno_screen.c \
-	freedreno_gmem.c
+	$(C_SOURCES) \
+	$(A2XX_SOURCES) \
+	$(A3XX_SOURCES)
 
 libfreedreno_la_LIBADD = \
-	a3xx/libfd3xx.la \
-	a2xx/libfd2xx.la \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(FREEDRENO_LIBS)
diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources
new file mode 100644
index 0000000..b287740
--- /dev/null
+++ b/src/gallium/drivers/freedreno/Makefile.sources
@@ -0,0 +1,43 @@
+C_SOURCES = \
+	freedreno_util.c \
+	freedreno_fence.c \
+	freedreno_resource.c \
+	freedreno_surface.c \
+	freedreno_draw.c \
+	freedreno_state.c \
+	freedreno_texture.c \
+	freedreno_context.c \
+	freedreno_screen.c \
+	freedreno_gmem.c
+
+A2XX_SOURCES = \
+	a2xx/fd2_blend.c \
+	a2xx/fd2_compiler.c \
+	a2xx/fd2_context.c \
+	a2xx/fd2_draw.c \
+	a2xx/fd2_emit.c \
+	a2xx/fd2_gmem.c \
+	a2xx/fd2_program.c \
+	a2xx/fd2_rasterizer.c \
+	a2xx/fd2_screen.c \
+	a2xx/fd2_texture.c \
+	a2xx/fd2_util.c \
+	a2xx/fd2_zsa.c \
+	a2xx/disasm-a2xx.c \
+	a2xx/ir-a2xx.c
+
+A3XX_SOURCES = \
+	a3xx/fd3_blend.c \
+	a3xx/fd3_compiler.c \
+	a3xx/fd3_context.c \
+	a3xx/fd3_draw.c \
+	a3xx/fd3_emit.c \
+	a3xx/fd3_gmem.c \
+	a3xx/fd3_program.c \
+	a3xx/fd3_rasterizer.c \
+	a3xx/fd3_screen.c \
+	a3xx/fd3_texture.c \
+	a3xx/fd3_util.c \
+	a3xx/fd3_zsa.c \
+	a3xx/disasm-a3xx.c \
+	a3xx/ir-a3xx.c
diff --git a/src/gallium/drivers/freedreno/a2xx/Makefile.am b/src/gallium/drivers/freedreno/a2xx/Makefile.am
deleted file mode 100644
index 8ab0f76..0000000
--- a/src/gallium/drivers/freedreno/a2xx/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-noinst_LTLIBRARIES = libfd2xx.la
-
-AM_CFLAGS = \
-	-Wno-packed-bitfield-compat \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/drivers/freedreno \
-	$(GALLIUM_CFLAGS) \
-	$(FREEDRENO_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-libfd2xx_la_SOURCES = \
-	fd2_blend.c \
-	fd2_compiler.c \
-	fd2_context.c \
-	fd2_draw.c \
-	fd2_emit.c \
-	fd2_gmem.c \
-	fd2_program.c \
-	fd2_rasterizer.c \
-	fd2_screen.c \
-	fd2_texture.c \
-	fd2_util.c \
-	fd2_zsa.c \
-	disasm-a2xx.c \
-	ir-a2xx.c
diff --git a/src/gallium/drivers/freedreno/a3xx/Makefile.am b/src/gallium/drivers/freedreno/a3xx/Makefile.am
deleted file mode 100644
index a7e415f..0000000
--- a/src/gallium/drivers/freedreno/a3xx/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-noinst_LTLIBRARIES = libfd3xx.la
-
-AM_CFLAGS = \
-	-Wno-packed-bitfield-compat \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/drivers/freedreno \
-	$(GALLIUM_CFLAGS) \
-	$(FREEDRENO_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-libfd3xx_la_SOURCES = \
-	fd3_blend.c \
-	fd3_compiler.c \
-	fd3_context.c \
-	fd3_draw.c \
-	fd3_emit.c \
-	fd3_gmem.c \
-	fd3_program.c \
-	fd3_rasterizer.c \
-	fd3_screen.c \
-	fd3_texture.c \
-	fd3_util.c \
-	fd3_zsa.c \
-	disasm-a3xx.c \
-	ir-a3xx.c
-- 
1.8.1.4