diff options
author | Kristian Høgsberg <krh@sasori.boston.redhat.com> | 2009-01-16 08:13:00 -0500 |
---|---|---|
committer | Kristian Høgsberg <krh@sasori.boston.redhat.com> | 2009-01-16 08:13:00 -0500 |
commit | 8012f32978b9b3d7ca162d971be48f6d3c0aa891 (patch) | |
tree | 7d846fa6d46624677a96e49a825e0d82a26fd9df | |
parent | 0ac16f056dc32235a54d1376cf8018d080506813 (diff) | |
download | wayland-8012f32978b9b3d7ca162d971be48f6d3c0aa891.tar.gz wayland-8012f32978b9b3d7ca162d971be48f6d3c0aa891.tar.xz wayland-8012f32978b9b3d7ca162d971be48f6d3c0aa891.zip |
Drop libdrm CFLAGS where no longer necessary.
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | flower.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index e17425a..19ad20a 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 4696617..95057d5 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 @@ -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> |