freedreno: compact a2xx and a3xx makefiles into parent ones

Nearly everything within the three Makefile.am's is identical.
Let's simplify things a little.

v2: Rebase and rewrite the commit message (Emil Velikov)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/configure.ac b/configure.ac
index e4a72849046ba15a2a813110260771bd377dc002..7b720871ccfde00014f482b258e2006945a8653e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1975,8 +1975,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/galahad/Makefile
                src/gallium/drivers/i915/Makefile
                src/gallium/drivers/identity/Makefile

diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 9f5a80af97925afabc666ec6c03fc8b98dbbccc9..22fd790dcdc0b066591aef190b7dc7efcca3915d 100644 (file)
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -12,11 +12,7 @@ AM_CFLAGS = \
        $(FREEDRENO_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
-SUBDIRS = a2xx a3xx
-
-libfreedreno_la_SOURCES = $(C_SOURCES)
-
-libfreedreno_la_LIBADD = \
-       a3xx/libfd3xx.la \
-       a2xx/libfd2xx.la
-
+libfreedreno_la_SOURCES = \
+       $(C_SOURCES) \
+       $(a2xx_SOURCES) \
+       $(a3xx_SOURCES)

diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources
index 02a88b6138d245039ad0db90334ad4d53400b61b..e54bff0369dc4021c6547e5d4180d8be25ca81e9 100644 (file)
--- a/src/gallium/drivers/freedreno/Makefile.sources
+++ b/src/gallium/drivers/freedreno/Makefile.sources
@@ -9,3 +9,35 @@ C_SOURCES := \
        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 (file)
index b8a5ac1..0000000
--- a/src/gallium/drivers/freedreno/a2xx/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include Makefile.sources
-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 = $(C_SOURCES)

diff --git a/src/gallium/drivers/freedreno/a2xx/Makefile.sources b/src/gallium/drivers/freedreno/a2xx/Makefile.sources
deleted file mode 100644 (file)
index 1ef2852..0000000
--- a/src/gallium/drivers/freedreno/a2xx/Makefile.sources
+++ /dev/null
@@ -1,15 +0,0 @@
-C_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 (file)
index 6b8b2e4..0000000
--- a/src/gallium/drivers/freedreno/a3xx/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include Makefile.sources
-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 = $(C_SOURCES)

diff --git a/src/gallium/drivers/freedreno/a3xx/Makefile.sources b/src/gallium/drivers/freedreno/a3xx/Makefile.sources
deleted file mode 100644 (file)
index 24ee6f0..0000000
--- a/src/gallium/drivers/freedreno/a3xx/Makefile.sources
+++ /dev/null
@@ -1,15 +0,0 @@
-C_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