Merge freedesktop/master into otc-private/master

[android-x86/external-mesa.git] / src / gallium / drivers / freedreno / Makefile.am

diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index dde0cf1..b6dbbd1 100644 (file)
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -5,28 +5,27 @@ noinst_LTLIBRARIES = libfreedreno.la
 AM_CFLAGS = \
        -Wno-packed-bitfield-compat \
        -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/drivers/freedreno/a3xx \
+       -I$(top_srcdir)/src/gallium/drivers/freedreno/a2xx \
        $(GALLIUM_CFLAGS) \
        $(FREEDRENO_CFLAGS) \
-       $(PIC_FLAGS) \
        $(VISIBILITY_CFLAGS)
 
+SUBDIRS = a2xx a3xx
+
 libfreedreno_la_SOURCES = \
        freedreno_util.c \
        freedreno_fence.c \
        freedreno_resource.c \
        freedreno_surface.c \
-       freedreno_vbo.c \
-       freedreno_blend.c \
-       freedreno_rasterizer.c \
-       freedreno_zsa.c \
+       freedreno_draw.c \
        freedreno_state.c \
-       freedreno_clear.c \
-       freedreno_program.c \
        freedreno_texture.c \
        freedreno_context.c \
        freedreno_screen.c \
-       freedreno_gmem.c \
-       freedreno_compiler.c \
-       ir-a2xx.c \
-       disasm.c
+       freedreno_gmem.c
+
+libfreedreno_la_LIBADD = \
+       a3xx/libfd3xx.la \
+       a2xx/libfd2xx.la