From effa536cf6a7831489a6fa7face11afeaffdc83f Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 16 Mar 2023 11:25:04 +0100 Subject: [PATCH] build: include vcap testcard in Makefile directly --- Makefile.in | 1 + configure.ac | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2623393b3..a63900dcd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -198,6 +198,7 @@ COMMON_OBJS = \ src/video_capture/import.o \ src/video_capture/null.o \ src/video_capture/switcher.o \ + src/video_capture/testcard.o \ src/video_capture/testcard_common.o \ src/video_capture/ug_input.o \ src/video_compress.o \ diff --git a/configure.ac b/configure.ac index 3cbda2ed1..2d1d661f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1590,11 +1590,6 @@ AC_ARG_ENABLE(testcard-extras, [testcard_extras_req=$build_default] ) -TESTCARD_OBJ="src/video_capture/testcard.o" -TESTCARD_LIB= -TESTCARD2_OBJ= -TESTCARD2_LIB= - testcard2_req=auto testcard_sdl_ttf_req=auto @@ -1615,9 +1610,6 @@ if expr $testcard_extras_req : '.*ttf' >/dev/null; then testcard_sdl_ttf_req=yes fi -TESTCARD_OBJ="src/video_capture/testcard.o" -ADD_MODULE("vidcap_testcard", "$TESTCARD_OBJ", "$TESTCARD_LIB") - if test $testcard2_req != no then TESTCARD2_OBJ="src/video_capture/testcard2.o"