From 12e9e1eafd6a905682c5ea3f70c51eda77fd90bd Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Thu, 15 Oct 2015 10:53:55 +0530 Subject: [PATCH] build: Fix up include file paths --- Makefile.am | 11 +++++++++++ webrtc-audio-processing.pc.in | 3 ++- webrtc/modules/audio_processing/Makefile.am | 8 -------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 878272d..56d41d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,3 +2,14 @@ SUBDIRS = webrtc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = webrtc-audio-processing.pc + +webrtcincludedir = $(includedir)/webrtc_audio_processing +nobase_webrtcinclude_HEADERS = webrtc/base/arraysize.h \ + webrtc/base/basictypes.h \ + webrtc/base/platform_file.h \ + webrtc/common.h \ + webrtc/typedefs.h \ + webrtc/modules/audio_processing/beamformer/array_util.h \ + webrtc/modules/audio_processing/include/audio_processing.h +# FIXME: We should deprecate installing this to the top directory soon +webrtcinclude_HEADERS = webrtc/modules/audio_processing/include/audio_processing.h diff --git a/webrtc-audio-processing.pc.in b/webrtc-audio-processing.pc.in index 724fd71..8fac70c 100644 --- a/webrtc-audio-processing.pc.in +++ b/webrtc-audio-processing.pc.in @@ -7,4 +7,5 @@ Name: webrtc-audio-processing Description: WebRTC Audio Processing library Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lwebrtc_audio_processing -Cflags: -I${includedir}/webrtc_audio_processing +# FIXME - defines should not be hardcoded +Cflags: -I${includedir}/webrtc_audio_processing -DWEBRTC_POSIX diff --git a/webrtc/modules/audio_processing/Makefile.am b/webrtc/modules/audio_processing/Makefile.am index 9c3d65d..f9b4ac7 100644 --- a/webrtc/modules/audio_processing/Makefile.am +++ b/webrtc/modules/audio_processing/Makefile.am @@ -1,13 +1,5 @@ lib_LTLIBRARIES = libwebrtc_audio_processing.la -webrtcincludedir = $(includedir)/webrtc_audio_processing -webrtcinclude_HEADERS = $(top_srcdir)/webrtc/base/arraysize.h \ - $(top_srcdir)/webrtc/base/platform_file.h \ - $(top_srcdir)/webrtc/common.h \ - $(top_srcdir)/webrtc/typedefs.h \ - $(top_srcdir)/webrtc/modules/audio_processing/beamformer/array_util.h \ - include/audio_processing.h - libwebrtc_audio_processing_la_SOURCES = include/audio_processing.h \ aec/include/echo_cancellation.h \ aec/aec_common.h \