diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-11-01 17:04:44 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-11-01 17:04:44 +0100 |
| commit | 593cb1874a7929909773ec5d95e4b1911ff27918 (patch) | |
| tree | 3a19da1702846a5a9de94a772fc589749a7b1452 | |
| parent | 37c64007345d4cf949746dd64b150162053de7cf (diff) | |
always require libdrm
... and also add the missing files to lib/Makefile.am
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | benchmarks/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 13 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
4 files changed, 6 insertions, 18 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 6829bbe..654946a 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -2,14 +2,12 @@ NULL=# bin_PROGRAMS = $(NULL) -if HAVE_DRM bin_PROGRAMS += \ intel_upload_blit_large \ intel_upload_blit_large_gtt \ intel_upload_blit_large_map \ intel_upload_blit_small \ $(NULL) -endif BENCHMARK_LIBS = \ ../lib/libintel_tools.la \ diff --git a/configure.ac b/configure.ac index 946fd95..89c0ee8 100644 --- a/configure.ac +++ b/configure.ac @@ -48,12 +48,7 @@ AM_PROG_CC_C_O LT_PREREQ([2.2]) LT_INIT([disable-static]) -PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23], have_drm=yes, have_drm=no) -if test "x$have_drm" = "xyes"; then - AC_DEFINE([HAVE_DRM], 1, [Define to 1 if we have DRM support]) -fi -AM_CONDITIONAL(HAVE_DRM, test "x$have_drm" = "xyes") - +PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) diff --git a/lib/Makefile.am b/lib/Makefile.am index 6afe084..7b143d2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,6 +3,7 @@ NULL=# AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/.. libintel_tools_la_SOURCES = \ intel_batchbuffer.h \ + intel_batchbuffer.c \ intel_chipset.h \ intel_gpu_tools.h \ intel_mmio.c \ @@ -12,18 +13,14 @@ libintel_tools_la_SOURCES = \ i915_reg.h \ i830_reg.h \ intel_reg_map.c \ + intel_drm.c \ instdone.c \ instdone.h \ - drmtest.h - -if HAVE_DRM -libintel_tools_la_SOURCES += \ - intel_batchbuffer.c \ - intel_drm.c \ - drmtest.c \ + drmtest.h \ + debug.h \ $(NULL) + AM_CFLAGS += $(DRM_CFLAGS) -endif noinst_LTLIBRARIES = libintel_tools.la diff --git a/tests/Makefile.am b/tests/Makefile.am index ef9bbad..525380e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,3 @@ -if HAVE_DRM noinst_PROGRAMS = \ gem_stress \ $(TESTS_progs) \ @@ -100,4 +99,3 @@ endif gem_fence_thrash_CFLAGS = $(AM_CFLAGS) -pthread gem_fence_thrash_LDADD = $(LDADD) -lpthread -endif |