From f0389b1cdf07dbfc0e1c23f8c8e4e2cc5ea1e0d3 Mon Sep 17 00:00:00 2001 From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Date: Tue, 1 Sep 2009 16:32:38 -0400 Subject: [PATCH] [#2101] Make the test directory compile --- sflphone-common/test/Makefile.am | 12 +++++++++++- sflphone-common/test/audiolayerTest.h | 4 ++-- sflphone-common/test/rtpTest.h | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sflphone-common/test/Makefile.am b/sflphone-common/test/Makefile.am index 1cbcaf8a5d..d4a2eb0510 100644 --- a/sflphone-common/test/Makefile.am +++ b/sflphone-common/test/Makefile.am @@ -1,6 +1,6 @@ include ../globals.mak -noinst_PROGRAMS = numbercleanerTester pluginmanagerTester hookmanagerTester audiolayerTester rtpTester historyTester +noinst_PROGRAMS = numbercleanerTester pluginmanagerTester hookmanagerTester audiolayerTester historyTester #rtpTester OBJECT_FILES= \ ../src/sflphoned-managerimpl.o \ @@ -58,6 +58,8 @@ pluginmanagerTester_LDADD = \ @CCEXT2_LIBS@ \ @CCGNU2_LIBS@ \ @CCRTP_LIBS@ \ + @ZRTPCPP_LIBS@ \ + @libssl_LIBS@ \ @SAMPLERATE_LIBS@ \ $(PJSIP_LIBS) \ -luuid \ @@ -76,6 +78,8 @@ hookmanagerTester_LDADD = \ @CCEXT2_LIBS@ \ @CCGNU2_LIBS@ \ @CCRTP_LIBS@ \ + @ZRTPCPP_LIBS@ \ + @libssl_LIBS@ \ @SAMPLERATE_LIBS@ \ $(PJSIP_LIBS) \ -luuid \ @@ -95,6 +99,8 @@ audiolayerTester_LDADD = \ @CCEXT2_LIBS@ \ @CCGNU2_LIBS@ \ @CCRTP_LIBS@ \ + @ZRTPCPP_LIBS@ \ + @libssl_LIBS@ \ @SAMPLERATE_LIBS@ \ $(PJSIP_LIBS) \ -luuid \ @@ -115,6 +121,8 @@ rtpTester_LDADD = \ @CCGNU2_LIBS@ \ @CCRTP_LIBS@ \ @SAMPLERATE_LIBS@ \ + @ZRTPCPP_LIBS@ \ + @libssl_LIBS@ \ $(PJSIP_LIBS) \ -luuid \ $(OBJECT_FILES) @@ -133,6 +141,8 @@ historyTester_LDADD = \ @CCEXT2_LIBS@ \ @CCGNU2_LIBS@ \ @CCRTP_LIBS@ \ + @ZRTPCPP_LIBS@ \ + @libssl_LIBS@ \ @SAMPLERATE_LIBS@ \ $(PJSIP_LIBS) \ -luuid \ diff --git a/sflphone-common/test/audiolayerTest.h b/sflphone-common/test/audiolayerTest.h index 87c13a7a85..7bda91c508 100644 --- a/sflphone-common/test/audiolayerTest.h +++ b/sflphone-common/test/audiolayerTest.h @@ -32,8 +32,8 @@ #include "user_cfg.h" #include "audio/audiolayer.h" -#include "audio/alsalayer.h" -#include "audio/pulselayer.h" +#include "audio/alsa/alsalayer.h" +#include "audio/pulseaudio/pulselayer.h" /* * @file audiorecorderTest.cpp diff --git a/sflphone-common/test/rtpTest.h b/sflphone-common/test/rtpTest.h index 4b49708d36..2f28c85627 100644 --- a/sflphone-common/test/rtpTest.h +++ b/sflphone-common/test/rtpTest.h @@ -39,10 +39,10 @@ // Application import #include "manager.h" -#include "audio/audiortp.h" -#include "../src/call.h" -#include "../src/sipcall.h" -#include "../src/sipvoiplink.h" +#include "audio/audiortp/AudioRtpSession.h" +#include "call.h" +#include "sip/sipcall.h" +#include "sip/sipvoiplink.h" #include "config/config.h" #include "user_cfg.h" -- GitLab