Move cairo-util to shared/

10 files changed, 17 insertions, 15 deletions

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 2377189..2325e16 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -57,9 +57,7 @@ noinst_LIBRARIES = libtoytoolkit.a
 
 libtoytoolkit_a_SOURCES =			\
 	window.c				\
-	window.h				\
-	cairo-util.c				\
-	cairo-util.h
+	window.h
 
 toolkit_libs =						\
 	libtoytoolkit.a					\
diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index 3643e46..7554df3 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -33,8 +33,8 @@
 #include <linux/input.h>
 
 #include <wayland-client.h>
-#include "cairo-util.h"
 #include "window.h"
+#include "../shared/cairo-util.h"
 #include "../shared/config-parser.h"
 
 #include "desktop-shell-client-protocol.h"
diff --git a/clients/dnd.c b/clients/dnd.c
index 45adc8a..b56cd59 100644
--- a/clients/dnd.c
+++ b/clients/dnd.c
@@ -34,7 +34,7 @@
 #include <wayland-client.h>
 
 #include "window.h"
-#include "cairo-util.h"
+#include "../shared/cairo-util.h"
 
 struct dnd {
 	struct window *window;
diff --git a/clients/image.c b/clients/image.c
index 36ab485..83ed231 100644
--- a/clients/image.c
+++ b/clients/image.c
@@ -35,7 +35,7 @@
 #include <wayland-client.h>
 
 #include "window.h"
-#include "cairo-util.h"
+#include "../shared/cairo-util.h"
 
 struct image {
 	struct window *window;
diff --git a/clients/tablet-shell.c b/clients/tablet-shell.c
index 3797f88..e2c49d3 100644
--- a/clients/tablet-shell.c
+++ b/clients/tablet-shell.c
@@ -27,7 +27,7 @@
 #include <sys/wait.h>
 
 #include "window.h"
-#include "cairo-util.h"
+#include "../shared/cairo-util.h"
 #include "../shared/config-parser.h"
 
 #include "tablet-shell-client-protocol.h"
diff --git a/clients/window.c b/clients/window.c
index 286a8ce..f3b768a 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -59,7 +59,7 @@
 
 #include <linux/input.h>
 #include <wayland-client.h>
-#include "cairo-util.h"
+#include "../shared/cairo-util.h"
 
 #include "window.h"
 
diff --git a/configure.ac b/configure.ac
index 748115e..f8ee2fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,10 +109,12 @@ PKG_CHECK_MODULES(PNG, [libpng])
 PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
 AS_IF([test "x$have_webp" = "xyes"],
       [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
-IMAGE_LIBS="$PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS"
-IMAGE_CFLAGS="$PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
-AC_SUBST(IMAGE_LIBS)
-AC_SUBST(IMAGE_CFLAGS)
+
+PKG_CHECK_MODULES(CAIRO, [cairo])
+SHARED_LIBS="$CAIRO_LIBS $PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS"
+SHARED_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
+AC_SUBST(SHARED_LIBS)
+AC_SUBST(SHARED_CFLAGS)
 
 AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes)
 if test x$have_jpeglib = xyes; then
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 71816f0..79af176 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -1,5 +1,5 @@
-libconfig_parser_la_LIBADD = $(IMAGE_LIBS)
-AM_CPPFLAGS = $(IMAGE_CFLAGS)
+libconfig_parser_la_LIBADD = $(SHARED_LIBS)
+AM_CPPFLAGS = $(SHARED_CFLAGS)
 AM_CFLAGS = $(GCC_CFLAGS)
 
 noinst_LTLIBRARIES = libconfig-parser.la
@@ -7,4 +7,6 @@ libconfig_parser_la_SOURCES =			\
 	config-parser.c				\
 	option-parser.c				\
 	image-loader.c				\
-	config-parser.h
+	config-parser.h				\
+	cairo-util.c				\
+	cairo-util.h
diff --git a/clients/cairo-util.c b/shared/cairo-util.c
index 9fd2e49..9fd2e49 100644
--- a/clients/cairo-util.c
+++ b/shared/cairo-util.c
diff --git a/clients/cairo-util.h b/shared/cairo-util.h
index 6dda7cf..6dda7cf 100644
--- a/clients/cairo-util.h
+++ b/shared/cairo-util.h