diff --git a/daemon/globals.mak b/daemon/globals.mak index fa550b71074b130a7c99c597e86ac58419c3fd45..9b16e56d3d68d4ad6e28a675600bd5a02380a2d4 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 eafcdede40c924e9639fd995903fe8e48675812d..e84aca38ece83f0c44f46c33d3d0ac512bdfb1ce 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 796b179ac95ae5faab5f540cc1dd07a513da921a..7a68aa1b1490660ae8b50807b2c45d4bcc86f563 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