Drop libdrm CFLAGS where no longer necessary.
authorKristian Høgsberg <krh@sasori.boston.redhat.com>
Fri, 16 Jan 2009 13:13:00 +0000 (08:13 -0500)
committerKristian Høgsberg <krh@sasori.boston.redhat.com>
Fri, 16 Jan 2009 13:13:00 +0000 (08:13 -0500)
Makefile.in
configure.ac
flower.c

index e17425a..19ad20a 100644 (file)
@@ -28,8 +28,6 @@ $(libs) : LDLIBS += @FFI_LIBS@
 $(libs) :
        gcc -shared $^ $(LDLIBS)  -o $@
 
-$(compositors) $(clients) : CFLAGS += @LIBDRM_CFLAGS@
-
 wayland-system-compositor :                    \
        wayland-system-compositor.o             \
        evdev.o                                 \
index 4696617..95057d5 100644 (file)
@@ -3,10 +3,9 @@ AC_PROG_CC
 
 PKG_PROG_PKG_CONFIG()
 PKG_CHECK_MODULES(FFI, [libffi])
-PKG_CHECK_MODULES(LIBDRM, [libdrm])
 
-PKG_CHECK_MODULES(EGL_COMPOSITOR, [eagle libpng cairo gdk-pixbuf-2.0 libudev])
-PKG_CHECK_MODULES(GL_COMPOSITOR, [gl x11])
+PKG_CHECK_MODULES(EGL_COMPOSITOR,
+                 [eagle libpng cairo gdk-pixbuf-2.0 libudev libdrm])
 PKG_CHECK_MODULES(CLIENT, [eagle cairo glib-2.0 libudev])
 
 if test $CC = gcc; then
index ce2cbc8..67fc334 100644 (file)
--- a/flower.c
+++ b/flower.c
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <i915_drm.h>
-#include <sys/ioctl.h>
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>