From 1e2e25e51d886cd8b89310b56194beaa24fabb22 Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Fri, 11 Nov 2005 17:42:25 +0000
Subject: [PATCH] Include portaudio.h from portaudio/pa_common/ Remove jack
code
---
portaudio/Makefile.am | 10 ++--------
src/Makefile.am | 2 +-
src/audio/Makefile.am | 2 +-
src/audio/pacpp/source/portaudiocpp/Makefile.am | 2 +-
src/managerimpl.cpp | 1 -
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/portaudio/Makefile.am b/portaudio/Makefile.am
index 928eaa0c59..8bdf58e7f0 100644
--- a/portaudio/Makefile.am
+++ b/portaudio/Makefile.am
@@ -7,7 +7,6 @@ libportaudio_la_CPPFLAGS = $(PORTAUDIO_CPPFLAGS) -Ipa_common/
pkginclude_HEADERS = pa_common/portaudio.h
-
if ENABLE_OSS
OSS=pa_unix_oss/pa_unix_oss.c
endif
@@ -16,19 +15,14 @@ if ENABLE_UNIX
UNIX=pa_unix/pa_unix_hostapis.c pa_unix/pa_unix_util.c
endif
-if ENABLE_JACK
-JACK=pa_jack/pa_jack.c
-endif
-
if ENABLE_ALSA
ALSA=pa_linux_alsa/pa_linux_alsa.c
endif
-SOURCES=${OSS} ${UNIX} ${JACK} ${ALSA}
-
+SOURCES=$(OSS) $(UNIX) $(ALSA)
-libportaudio_la_SOURCES = ${SOURCES} \
+libportaudio_la_SOURCES = $(SOURCES) \
pa_common/pa_allocation.c \
pa_common/pa_converters.c \
pa_common/pa_cpuload.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 2efb0bc25d..754fd904ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ sflphoned_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone
#sflphoned_LDFLAGS = -static
sflphoned_LDADD = ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD)
#KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir)/audio/pacpp/include $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(portaudio_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir)/audio/pacpp/include $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(portaudio_CFLAGS) -I$(top_srcdir)/portaudio/pa_common
libsflphone_la_LDFLAGS= -version-info 0:1:0
libsflphone_la_LIBADD = \
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index f095b0b8e4..e06a37cc64 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -10,7 +10,7 @@ libaudio_la_SOURCES = alaw.cpp alaw.h audiocodec.cpp audiocodec.h \
tonegenerator.cpp tonegenerator.h ulaw.cpp ulaw.h tone.cpp tonelist.cpp audioloop.cpp \
audiofile.cpp
-AM_CXXFLAGS = -I$(top_srcdir)/include -I$(srcdir)/pacpp/include/ $(libccext2_CFLAGS) $(libccrtp1_CFLAGS) $(portaudio_CFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/include -I$(srcdir)/pacpp/include/ $(libccext2_CFLAGS) $(libccrtp1_CFLAGS) $(portaudio_CFLAGS) -I$(top_srcdir)/portaudio/pa_common
libaudio_la_LIBADD = gsm/libgsm.la pacpp/source/portaudiocpp/libportaudiocpp.la
noinst_HEADERS = tone.h tonelist.h audioloop.h audiofile.h
diff --git a/src/audio/pacpp/source/portaudiocpp/Makefile.am b/src/audio/pacpp/source/portaudiocpp/Makefile.am
index dbc2826645..a6de8cbeee 100644
--- a/src/audio/pacpp/source/portaudiocpp/Makefile.am
+++ b/src/audio/pacpp/source/portaudiocpp/Makefile.am
@@ -19,4 +19,4 @@ libportaudiocpp_la_SOURCES = \
SystemHostApiIterator.cxx
-AM_CXXFLAGS = -I$(srcdir)/../../include
+AM_CXXFLAGS = -I$(srcdir)/../../include -I$(srcdir)/../../../../../portaudio/pa_common
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index f64a3497b5..2da2b37fd9 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -35,7 +35,6 @@
#include "manager.h"
#include "audio/audiolayer.h"
#include "audio/audiocodec.h"
-//#include "audio/ringbuffer.h"
#include "audio/tonelist.h"
#include "sipvoiplink.h"
--
GitLab