[PATCH] shared: Fix build to ensure weston_matrix_ is still exported

Rob Bradford robert.bradford at intel.com
Fri Dec 7 09:36:13 PST 2012


From: Rob Bradford <rob at linux.intel.com>

We need to ensure that weston_matrix_ functions are available so include
wayland-util.h to provide the WL_EXPORT macro. To ensure that that header file
can be found we must search the appropriate path. Adding $(COMPOSITOR_CFLAGS)
to the CFLAGS is sufficient.
---
 shared/Makefile.am | 2 +-
 shared/matrix.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/Makefile.am b/shared/Makefile.am
index faf073d..c3f5208 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libshared.la libshared-cairo.la
 
-libshared_la_CFLAGS = $(GCC_CFLAGS)
+libshared_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
 
 libshared_la_SOURCES =				\
 	config-parser.c				\
diff --git a/shared/matrix.c b/shared/matrix.c
index 91acdd3..8c35bfb 100644
--- a/shared/matrix.c
+++ b/shared/matrix.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include <wayland-server.h>
+#include <wayland-util.h>
 
 #include "matrix.h"
 
-- 
1.7.11.7



More information about the wayland-devel mailing list