From 4a822495fad43b8b971ed49184ebd4eebe24b674 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 3 Dec 2012 19:44:14 +0000 Subject: [PATCH] Move matrix.[ch] to shared This means it can be used for the calibration tool. --- shared/Makefile.am | 4 +++- {src => shared}/matrix.c | 0 {src => shared}/matrix.h | 0 src/Makefile.am | 2 -- src/compositor.h | 2 +- tests/Makefile.am | 4 ++-- tests/matrix-test.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename {src => shared}/matrix.c (100%) rename {src => shared}/matrix.h (100%) diff --git a/shared/Makefile.am b/shared/Makefile.am index b38cb95d..faf073db 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -7,7 +7,9 @@ libshared_la_SOURCES = \ option-parser.c \ config-parser.h \ os-compatibility.c \ - os-compatibility.h + os-compatibility.h \ + matrix.c \ + matrix.h libshared_cairo_la_CFLAGS = \ $(GCC_CFLAGS) \ diff --git a/src/matrix.c b/shared/matrix.c similarity index 100% rename from src/matrix.c rename to shared/matrix.c diff --git a/src/matrix.h b/shared/matrix.h similarity index 100% rename from src/matrix.h rename to shared/matrix.h diff --git a/src/Makefile.am b/src/Makefile.am index e8315ca4..0d92194d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,8 +32,6 @@ weston_SOURCES = \ workspaces-protocol.c \ workspaces-server-protocol.h \ util.c \ - matrix.c \ - matrix.h \ gl-renderer.h \ gl-renderer.c \ noop-renderer.c \ diff --git a/src/compositor.h b/src/compositor.h index 2547da13..ff7c932f 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -28,7 +28,7 @@ #include #include -#include "matrix.h" +#include "../shared/matrix.h" #include "../shared/config-parser.h" #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 944879fd..b1b76ba8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,8 +36,8 @@ noinst_PROGRAMS = $(setbacklight) matrix-test matrix_test_SOURCES = \ matrix-test.c \ - $(top_srcdir)/src/matrix.c \ - $(top_srcdir)/src/matrix.h + $(top_srcdir)/shared/matrix.c \ + $(top_srcdir)/shared/matrix.h matrix_test_LDADD = -lm -lrt setbacklight_SOURCES = \ diff --git a/tests/matrix-test.c b/tests/matrix-test.c index cc78492f..5b0513f3 100644 --- a/tests/matrix-test.c +++ b/tests/matrix-test.c @@ -27,7 +27,7 @@ #include #include -#include "matrix.h" +#include "../shared/matrix.h" struct inverse_matrix { double LU[16]; /* column-major */