From 640684403327250392107f027e5cd2fb2c76f7d9 Mon Sep 17 00:00:00 2001
From: Simon Ser <simon.ser@intel.com>
Date: Thu, 25 Apr 2019 13:43:22 +0300
Subject: autotools: fix audio and chamelium builds

The commit introducing Chamelium audio tests and removing old audio tests
doesn't update autotools files. This patch fixes it.

Signed-off-by: Simon Ser <simon.ser@intel.com>
Fixes: 311baff151f90c1db6f57ee9515216b4f9da5db7
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
 configure.ac      | 25 +++++--------------------
 lib/Makefile.am   |  2 ++
 tests/Makefile.am | 13 ++-----------
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3f541a2..7467e620 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,9 @@ PKG_CHECK_MODULES(PIXMAN, [pixman-1 >= 0.36.0], [], [
 PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no])
 AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes])
 
+PKG_CHECK_MODULES(ALSA, [alsa], [alsa=yes], [alsa=no])
+AM_CONDITIONAL(HAVE_ALSA, [test "x$alsa" = xyes])
+
 # for chamelium
 AC_ARG_ENABLE(chamelium, AS_HELP_STRING([--enable-chamelium],
 	      [Enable building of chamelium libraries and tests (default: no)]),
@@ -173,28 +176,11 @@ if test "x$enable_chamelium" = xyes; then
 	if test x"$gsl" != xyes; then
 		AC_MSG_ERROR([Failed to find gsl, required by chamelium.])
 	fi
-
-	AC_DEFINE(HAVE_CHAMELIUM, 1, [Enable Chamelium support])
-fi
-
-PKG_CHECK_MODULES(ALSA, [alsa], [alsa=yes], [alsa=no])
-AM_CONDITIONAL(HAVE_ALSA, [test "x$alsa" = xyes])
-
-# for audio
-AC_ARG_ENABLE(audio, AS_HELP_STRING([--enable-audio],
-	      [Enable building of audio tests (default: no)]),
-	      [if test x$enableval = xyes; then enable_audio=yes; fi],
-	      [enable_audio=no])
-AM_CONDITIONAL(HAVE_AUDIO, [test "x$enable_audio" = xyes])
-if test "x$enable_audio" = xyes; then
 	if test x"$alsa" != xyes; then
-		AC_MSG_ERROR([Failed to find ALSA, required by audio.])
-	fi
-	if test x"$gsl" != xyes; then
-		AC_MSG_ERROR([Failed to find gsl, required by audio.])
+		AC_MSG_ERROR([Failed to find alsa, required by chamelium.])
 	fi
 
-	AC_DEFINE(HAVE_AUDIO, 1, [Enable Audio support])
+	AC_DEFINE(HAVE_CHAMELIUM, 1, [Enable Chamelium support])
 fi
 
 # -----------------------------------------------------------------------------
@@ -325,7 +311,6 @@ echo ""
 echo " • Tests:"
 echo "       Build tests        : ${BUILD_TESTS}"
 echo "       Chamelium tests    : ${enable_chamelium}"
-echo "       Audio tests        : ${enable_audio}"
 echo "       Compile prime tests: ${NOUVEAU}"
 echo "       Debug flags        : ${DEBUG_CFLAGS}"
 echo ""
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 62e8bda7..4a71b828 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,6 +22,8 @@ if HAVE_CHAMELIUM
 lib_source_list +=	 	\
 	igt_chamelium.h		\
 	igt_chamelium.c		\
+	igt_chamelium_stream.h	\
+	igt_chamelium_stream.c	\
 	$(NULL)
 endif
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 289249b4..5097debf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,12 +16,6 @@ TESTS_progs += \
 	$(NULL)
 endif
 
-if HAVE_AUDIO
-TESTS_progs += \
-	audio \
-	$(NULL)
-endif
-
 TESTS_progs += testdisplay
 
 if BUILD_TESTS
@@ -137,11 +131,8 @@ 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)
 
-kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS)
-kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS)
-
-audio_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
-audio_LDADD = $(LDADD) $(ALSA_LIBS)
+kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS) $(ALSA_CFLAGS)
+kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS) $(ALSA_LIBS)
 
 testdisplay_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
 
-- 
cgit v1.2.3