flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-19 22:06:13 +00:00
Code Issues Releases Wiki Activity

always require libdrm

Browse Source 
... and also add the missing files to lib/Makefile.am

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2011-11-01 17:04:44 +01:00
parent 37c6400734
commit 593cb1874a
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/Makefile.am
View File

@ -2,14 +2,12 @@ NULL=#
bin_PROGRAMS = $(NULL) bin_PROGRAMS = $(NULL)
if HAVE_DRM
bin_PROGRAMS += \ bin_PROGRAMS += \
intel_upload_blit_large \ intel_upload_blit_large \
intel_upload_blit_large_gtt \ intel_upload_blit_large_gtt \
intel_upload_blit_large_map \ intel_upload_blit_large_map \
intel_upload_blit_small \ intel_upload_blit_small \
$(NULL) $(NULL)
endif
BENCHMARK_LIBS = \ BENCHMARK_LIBS = \
../lib/libintel_tools.la \ ../lib/libintel_tools.la \

7
configure.ac
View File

@ -48,12 +48,7 @@ AM_PROG_CC_C_O
LT_PREREQ([2.2]) LT_PREREQ([2.2])
LT_INIT([disable-static]) LT_INIT([disable-static])
PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23], have_drm=yes, have_drm=no) PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23])
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(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])

13
lib/Makefile.am
View File

@ -3,6 +3,7 @@ NULL=#
AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/.. AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/..
libintel_tools_la_SOURCES = \ libintel_tools_la_SOURCES = \
intel_batchbuffer.h \ intel_batchbuffer.h \
intel_batchbuffer.c \
intel_chipset.h \ intel_chipset.h \
intel_gpu_tools.h \ intel_gpu_tools.h \
intel_mmio.c \ intel_mmio.c \
@ -12,18 +13,14 @@ libintel_tools_la_SOURCES = \
i915_reg.h \ i915_reg.h \
i830_reg.h \ i830_reg.h \
intel_reg_map.c \ intel_reg_map.c \
intel_drm.c \
instdone.c \ instdone.c \
instdone.h \ instdone.h \
drmtest.h drmtest.h \
debug.h \
if HAVE_DRM
libintel_tools_la_SOURCES += \
intel_batchbuffer.c \
intel_drm.c \
drmtest.c \
$(NULL) $(NULL)
AM_CFLAGS += $(DRM_CFLAGS) AM_CFLAGS += $(DRM_CFLAGS)
endif
noinst_LTLIBRARIES = libintel_tools.la noinst_LTLIBRARIES = libintel_tools.la

2
tests/Makefile.am
View File

@ -1,4 +1,3 @@
if HAVE_DRM
noinst_PROGRAMS = \ noinst_PROGRAMS = \
gem_stress \ gem_stress \
$(TESTS_progs) \ $(TESTS_progs) \
@ -100,4 +99,3 @@ endif
gem_fence_thrash_CFLAGS = $(AM_CFLAGS) -pthread gem_fence_thrash_CFLAGS = $(AM_CFLAGS) -pthread
gem_fence_thrash_LDADD = $(LDADD) -lpthread gem_fence_thrash_LDADD = $(LDADD) -lpthread
endif