From 3873e718a4740903f551c628317fd71235d66ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@savoirfairelinux.com> Date: Thu, 22 Sep 2011 16:31:32 -0400 Subject: [PATCH] Fix daemon video tests --- daemon/globals.mak | 2 +- daemon/src/video/Makefile.am | 2 +- daemon/src/video/test/Makefile.am | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/globals.mak b/daemon/globals.mak index fa550b7107..9b16e56d3d 100644 --- a/daemon/globals.mak +++ b/daemon/globals.mak @@ -2,7 +2,7 @@ #CXXFLAGS=-Wall -Werror -Wextra -src=$(top_srcdir) +src=$(abs_top_srcdir) sfllibdir=$(DESTDIR)$(libdir)/sflphone sflcodecdir=$(sfllibdir)/codecs sflplugindir=$(sfllibdir)/plugins diff --git a/daemon/src/video/Makefile.am b/daemon/src/video/Makefile.am index eafcdede40..e84aca38ec 100644 --- a/daemon/src/video/Makefile.am +++ b/daemon/src/video/Makefile.am @@ -21,4 +21,4 @@ ffmpeg2rtp_SOURCES=ffmpeg2rtp.cpp -I . ffmpeg2rtp_LDADD=@LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ libvideo.la $(top_builddir)/src/libsflphone.la @CCRTP_LIBS@ ffmpeg2shm_SOURCES=ffmpeg2shm.c -ffmpeg2shm_LDADD=@LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ +ffmpeg2shm_LDADD=@LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ diff --git a/daemon/src/video/test/Makefile.am b/daemon/src/video/test/Makefile.am index 796b179ac9..7a68aa1b14 100644 --- a/daemon/src/video/test/Makefile.am +++ b/daemon/src/video/test/Makefile.am @@ -1,3 +1,5 @@ +include ../../../globals.mak + TESTS=test_video_endpoint test_thread test_v4l2 check_PROGRAMS=test_video_endpoint test_video_rtp test_thread test_video_preview test_v4l2 -- GitLab