From d21e95ca81da6f9332999ceebe6b42e4425d3bb6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 10 Nov 2017 12:39:56 -0800 Subject: tests: Remove libdrm_vc4 dependency. The autotools build retains the configure.ac option, while meson folds vc4 into the default build since we don't have any meson_options.txt to control parts of the build. Signed-off-by: Eric Anholt Acked-by: Petri Latvala Acked-by: Daniel Vetter --- tests/Makefile.am | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 3cf5af3a..81e320c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,7 @@ if HAVE_LIBDRM_NOUVEAU TESTS_progs += $(NOUVEAU_TESTS) endif -if HAVE_LIBDRM_VC4 +if BUILD_VC4 TESTS_progs += $(VC4_TESTS) endif @@ -143,16 +143,6 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_lookup_fail_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_lookup_fail_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_dmabuf_poll_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_dmabuf_poll_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS) kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS) kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS) -- cgit v1.2.3