summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2013-01-28 16:03:51 -0500
committerKristian Høgsberg <krh@bitplanet.net>2013-02-14 15:59:25 -0500
commitcdfc4c2d45b48ab12c243bb7f011f1244b3b0a83 (patch)
treea692e2f0f1ed9319829c61fe338d10282ef96072
parentcc7ad840788cbbddfcfb3d0bc2a1ec77fb46d5e8 (diff)
downloadweston-cdfc4c2d45b48ab12c243bb7f011f1244b3b0a83.tar.gz
toytoolkit: Remove left-over pixman dependency
toytoolkit doesn't use pixman. Remove the pixman.h include and the LDADD. https://bugs.freedesktop.org/show_bug.cgi?id=57812
-rw-r--r--clients/Makefile.am3
-rw-r--r--clients/window.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/clients/Makefile.am b/clients/Makefile.am
index 18af2c00..621c7c35 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -82,7 +82,6 @@ libtoytoolkit_la_SOURCES = \
workspaces-client-protocol.h
libtoytoolkit_la_LIBADD = \
- $(PIXMAN_LIBS) \
$(CLIENT_LIBS) \
$(CAIRO_EGL_LIBS) \
../shared/libshared-cairo.la -lrt -lm
@@ -104,7 +103,7 @@ image_LDADD = libtoytoolkit.la
cliptest_SOURCES = cliptest.c
cliptest_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAN_CFLAGS)
-cliptest_LDADD = libtoytoolkit.la
+cliptest_LDADD = libtoytoolkit.la $(PIXMAN_LIBS)
dnd_SOURCES = dnd.c
dnd_LDADD = libtoytoolkit.la
diff --git a/clients/window.c b/clients/window.c
index b7abfc8a..3d23b3ae 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -39,8 +39,6 @@
#include <sys/epoll.h>
#include <sys/timerfd.h>
-#include <pixman.h>
-
#ifdef HAVE_CAIRO_EGL
#include <wayland-egl.h>