fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 17:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno: compact a2xx and a3xx makefiles into parent ones

Browse source 
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>
This commit is contained in:
Johannes Obermayr 2013-11-01 18:38:14 +00:00 • committed by Emil Velikov
parent c5062726f1
commit 595bd01eb1
7 changed files with 36 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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

12
src/gallium/drivers/freedreno/Makefile.am
View file

@ -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)

32
src/gallium/drivers/freedreno/Makefile.sources
View file

@ -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

14
src/gallium/drivers/freedreno/a2xx/Makefile.am
View file

@ -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)

15
src/gallium/drivers/freedreno/a2xx/Makefile.sources
View file

@ -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

14
src/gallium/drivers/freedreno/a3xx/Makefile.am
View file

@ -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)

15
src/gallium/drivers/freedreno/a3xx/Makefile.sources
View file

@ -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