Make automake's subdir-objects work. Update includes. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> --- src/gallium/drivers/r300/Makefile.am | 6 +++--- src/gallium/drivers/r300/ralloc.c | 1 + src/gallium/drivers/r300/register_allocate.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 120000 src/gallium/drivers/r300/ralloc.c create mode 120000 src/gallium/drivers/r300/register_allocate.c
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index 14aaf03..524df24 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -8,7 +8,7 @@ TESTS = r300_compiler_tests AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mesa/program \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/glsl \ -I$(top_srcdir)/src/mapi \ @@ -40,5 +40,5 @@ libr300_la_SOURCES = $(C_SOURCES) # Solve this by building them into a separate helper library that can be linked # in place of libmesagallium. libr300_helper_la_SOURCES = \ - $(top_srcdir)/src/glsl/ralloc.c \ - $(top_srcdir)/src/mesa/program/register_allocate.c + ralloc.c \ + register_allocate.c diff --git a/src/gallium/drivers/r300/ralloc.c b/src/gallium/drivers/r300/ralloc.c new file mode 120000 index 0000000..c5402db --- /dev/null +++ b/src/gallium/drivers/r300/ralloc.c @@ -0,0 +1 @@ +../../../glsl/ralloc.c \ No newline at end of file diff --git a/src/gallium/drivers/r300/register_allocate.c b/src/gallium/drivers/r300/register_allocate.c new file mode 120000 index 0000000..2117950 --- /dev/null +++ b/src/gallium/drivers/r300/register_allocate.c @@ -0,0 +1 @@ +../../../mesa/program/register_allocate.c \ No newline at end of file -- 1.8.4.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev