From 8012f32978b9b3d7ca162d971be48f6d3c0aa891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 16 Jan 2009 08:13:00 -0500 Subject: [PATCH] Drop libdrm CFLAGS where no longer necessary. --- Makefile.in | 2 -- configure.ac | 5 ++--- flower.c | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index e17425a0..19ad20a9 100644 --- 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 \ diff --git a/configure.ac b/configure.ac index 46966179..95057d50 100644 --- 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 diff --git a/flower.c b/flower.c index ce2cbc8b..67fc3347 100644 --- a/flower.c +++ b/flower.c @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include