Drop libdrm CFLAGS where no longer necessary.

2009-01-16 08:13:00 -05:00 · 2009-01-16 08:13:00 -05:00 · 8012f32978
parent 0ac16f056d
commit 8012f32978
3 changed files with 2 additions and 7 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -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					\
--- a/configure.ac
+++ b/configure.ac
@ -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
--- 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>