summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2015-12-15 14:44:54 +0100
committerDave Airlie <airlied@redhat.com>2015-12-22 09:06:46 +1000
commitaa34024038495b49211d04b3f184b4714d814b38 (patch)
tree221393b1463e3aac6c4f3eff1244031bea7ccc64
parentaee033c1c4388fc6a455d9b636ce20e5111d494d (diff)
build-sys: misc cleanups
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--configure.ac7
-rw-r--r--src/Makefile.am1
2 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 9ca5585..59a0bb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,11 +84,8 @@ if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Wall -std=c99"
fi
-PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
- [have_libdrm=yes], [have_libdrm=no])
-
-PKG_CHECK_MODULES([EPOXY], [epoxy],
- [have_epoxy=yes], [have_epoxy=no])
+PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
+PKG_CHECK_MODULES([EPOXY], [epoxy])
AC_SUBST([DEFINES])
AC_CONFIG_FILES([
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bac7b2..61cf879 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
SUBDIRS := gallium/auxiliary
AM_LDFLAGS = -lgbm -lm -ldl -I./gallium/include \
$(EPOXY_LIBS) \
- $(GL_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
AM_CFLAGS = \