With the brw_* files imported from mesa.

There are still a few things in that library that needs gen4asm.h, for
instance the GLuint and GLint types. The hope is that eventually libbrw
can be split out in its own directory and shared.

Signed-off-by: Damien Lespiau <damien.lesp...@intel.com>
---
 assembler/Makefile.am |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/assembler/Makefile.am b/assembler/Makefile.am
index 9bd3289..d5affd0 100644
--- a/assembler/Makefile.am
+++ b/assembler/Makefile.am
@@ -1,7 +1,22 @@
 SUBDIRS = doc test
 
+noinst_LTLIBRARIES = libbrw.la
+
 bin_PROGRAMS = intel-gen4asm intel-gen4disasm
 
+libbrw_la_SOURCES =    \
+       brw_compat.h    \
+       brw_context.c   \
+       brw_context.h   \
+       brw_disasm.c    \
+       brw_defines.h   \
+       brw_eu.h        \
+       brw_reg.h       \
+       brw_structs.h   \
+       ralloc.c        \
+       ralloc.h        \
+       $(NULL)
+
 AM_YFLAGS = -d --warnings=all
 AM_CFLAGS= $(ASSEMBLER_WARN_CFLAGS)
 
@@ -10,23 +25,16 @@ BUILT_SOURCES = gram.h gram.c lex.c
 gram.h: gram.c
 
 intel_gen4asm_SOURCES =        \
-       brw_compat.h    \
-       brw_context.c   \
-       brw_context.h   \
-       ralloc.c        \
-       ralloc.h        \
-       brw_defines.h   \
-       brw_eu.h        \
-       brw_reg.h       \
-       brw_structs.h   \
        gen4asm.h       \
        gram.y          \
        lex.l           \
        main.c          \
        $(NULL)
 
-intel_gen4disasm_SOURCES =  \
-       brw_disasm.c disasm-main.c
+intel_gen4asm_LDADD = libbrw.la
+
+intel_gen4disasm_SOURCES =  disasm-main.c
+intel_gen4disasm_LDADD = libbrw.la
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = intel-gen4asm.pc
-- 
1.7.7.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to