summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--audio_effects/include/Makefile.am15
-rw-r--r--audio_route/Makefile.am2
-rw-r--r--audio_utils/Makefile.am22
-rw-r--r--configure.ac7
5 files changed, 31 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index 120ba3a..c7b8159 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,5 +4,6 @@ BUILD_COMPONENTS += camera/src
BUILD_COMPONENTS += audio_route
BUILD_COMPONENTS += audio_utils
BUILD_COMPONENTS += audio/include
+BUILD_COMPONENTS += audio_effects/include
SUBDIRS := $(BUILD_COMPONENTS)
diff --git a/audio_effects/include/Makefile.am b/audio_effects/include/Makefile.am
new file mode 100644
index 0000000..e5f667a
--- /dev/null
+++ b/audio_effects/include/Makefile.am
@@ -0,0 +1,15 @@
+h_sources = audio_effects/audio_effects_conf.h \
+ audio_effects/effect_aec.h \
+ audio_effects/effect_agc.h \
+ audio_effects/effect_bassboost.h \
+ audio_effects/effect_downmix.h \
+ audio_effects/effect_environmentalreverb.h \
+ audio_effects/effect_equalizer.h \
+ audio_effects/effect_loudnessenhancer.h \
+ audio_effects/effect_ns.h \
+ audio_effects/effect_presetreverb.h \
+ audio_effects/effect_virtualizer.h \
+ audio_effects/effect_visualizer.h
+
+lib_includedir = $(includedir)/audio_effects/
+lib_include_HEADERS = $(h_sources)
diff --git a/audio_route/Makefile.am b/audio_route/Makefile.am
index cc2d240..732a201 100644
--- a/audio_route/Makefile.am
+++ b/audio_route/Makefile.am
@@ -3,8 +3,6 @@ pkgconfig_DATA = audio_route.pc
AM_CFLAGS = -Werror -Wall
-AM_CFLAGS += -I ${WORKSPACE}/external/tinyalsa/include
-
library_includedir = $(includedir)/audio_route
library_include_HEADERS = include/audio_route/audio_route.h
diff --git a/audio_utils/Makefile.am b/audio_utils/Makefile.am
index f898dc5..cd01e11 100644
--- a/audio_utils/Makefile.am
+++ b/audio_utils/Makefile.am
@@ -1,16 +1,16 @@
-#compile audio utils
+##### audioutils #####
AM_CFLAGS = -Werror -Wall
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = audio_utils.pc
EXTRA_DIST = $(pkgconfig_DATA)
-AM_CFLAGS += -I $(WORKSPACE)/system/media/audio/include
-AM_CFLAGS += -I $(WORKSPACE)/system/media/audio_utils/include
+AM_CFLAGS += -I $(top_srcdir)/audio/include
+AM_CFLAGS += -I $(top_srcdir)/audio_utils/include
-libraryaudioutils_includedir = $(includedir)/audio/audio_utils
-libraryaudioutils_include_HEADERS = include/audio_utils/primitives.h
-libraryaudioutils_include_HEADERS += include/audio_utils/format.h
+audioutils_includedir = $(includedir)/audio_utils
+audioutils_include_HEADERS = include/audio_utils/primitives.h
+audioutils_include_HEADERS += include/audio_utils/format.h
audioutils_sources = format.c \
channels.c \
@@ -21,17 +21,17 @@ libaudioutils_la_SOURCES = $(audioutils_sources)
libaudioutils_la_CFLAGS = $(AM_CFLAGS)
libaudioutils_la_LDFLAGS = -shared
-#compile tinysndfile
+##### tinysndfile #####
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA += tinysndfile.pc
EXTRA_DIST = $(pkgconfig_DATA)
-AM_CFLAGS += -I $(WORKSPACE)/system/media/audio_utils
-AM_CFLAGS += -I $(WORKSPACE)/system/media/audio_utils/include
+AM_CFLAGS += -I $(top_srcdir)/audio_utils
+AM_CFLAGS += -I $(top_srcdir)/audio_utils/include
-librarytinysnd_includedir = $(includedir)/tinysndfile
-librarytinysnd_include_HEADERS = include/audio_utils/sndfile.h
+tinysnd_includedir = $(includedir)/tinysndfile
+tinysnd_include_HEADERS = include/audio_utils/sndfile.h
tinysnd_sources = tinysndfile.c \
primitives.c
diff --git a/configure.ac b/configure.ac
index 75465af..6173f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,10 +67,11 @@ AC_CONFIG_FILES([ \
Makefile \
camera/src/Makefile \
audio_route/Makefile \
+ audio_route/audio_route.pc \
audio_utils/Makefile \
- audio/include/Makefile \
- audio_utils/tinysndfile.pc \
audio_utils/audio_utils.pc \
- audio_route/audio_route.pc
+ audio_utils/tinysndfile.pc \
+ audio/include/Makefile \
+ audio_effects/include/Makefile
])
AC_OUTPUT