Skip to content

Commit 0d19fa1

Browse files
man-ravqti-sbojja
authored andcommitted
pal: build configuration adaptations for openwrt
Reorganizes the build system to better handle different target environments. Remove acdbdata library linkage from the OpenWRT build configuration in the main Makefile. The configure script has been updated to check for capiv2-api-headers globally, ensuring consistent header availability across build configurations. Additionally, stream subdirectory build rules has been modified to exclude StreamCallTranslation for OpenWRT build. Change-Id: I216cb6d203a2802cf8ddc7ee2d252716a1b543c1
1 parent f7057f0 commit 0d19fa1

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ library_includedir = $(includedir)/pal
8787
lib_LTLIBRARIES = libpal.la
8888
libpal_la_SOURCES = $(pal_sources)
8989
if BUILDSYSTEM_OPENWRT
90-
libpal_la_LIBADD = $(GLIB_LIBS) -ltinyalsa -laudioroute -lar-osal -lar-spfhdrs -lexpat -ltinycompress -lagmclientwrapper
91-
libpal_la_LIBADD += -lar-gsl -lacdbdata
90+
libpal_la_LIBADD = $(GLIB_LIBS) -ltinyalsa -laudioroute -lar-osal -lexpat -ltinycompress -lagmclientwrapper
91+
libpal_la_LIBADD += -lar-gsl
9292
libpal_la_CPPFLAGS = -DFEATURE_IPQ_OPENWRT
9393
else
9494
libpal_la_LIBADD = $(GLIB_LIBS) -ltinyalsa -laudioroute -lar-osal -lexpat -ltinycompress

configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ AS_IF([test "x$with_acdbdata" != "xno"], [ACDBDATA_CFLAGS="-I$with_acdbdata"])
9191

9292
AC_SUBST(ACDBDATA_CFLAGS)
9393

94+
PKG_CHECK_MODULES([CAPIV2HEADERS], [capiv2-api-headers], [have_capiv2_headers=yes], [have_capiv2_headers=no])
95+
AM_CONDITIONAL([HAVE_CAPIV2HEADERS], [test "x$have_capiv2_headers" = "xyes"])
96+
AC_SUBST([CAPIV2HEADERS_CFLAGS])
97+
9498
if (test "x${with_openwrt}" = "xno"); then
9599

96100
PKG_CHECK_MODULES([PALHEADERS], [pal-headers])
97101
AC_SUBST([PALHEADERS_CFLAGS])
98102

99-
PKG_CHECK_MODULES([CAPIV2HEADERS], [capiv2-api-headers], [have_capiv2_headers=yes], [have_capiv2_headers=no])
100-
AM_CONDITIONAL([HAVE_CAPIV2HEADERS], [test "x$have_capiv2_headers" = "xyes"])
101-
AC_SUBST([CAPIV2HEADERS_CFLAGS])
102-
103103
PKG_CHECK_MODULES([KVH2XML], [kvh2xml])
104104
AC_SUBST([KVH2XML_CFLAGS])
105105

stream/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
if COMPILE_STREAMSOUNDTRIGGER
22
SUBDIRS = StreamCommon StreamSoundTrigger StreamPCM StreamNonTunnel StreamInCall StreamHaptic StreamCompress StreamASR StreamACD StreamCallTranslation
33
else
4+
if BUILDSYSTEM_OPENWRT
5+
SUBDIRS = StreamCommon StreamSoundTrigger StreamPCM StreamNonTunnel StreamInCall StreamHaptic StreamCompress StreamASR StreamACD
6+
else
47
SUBDIRS = StreamCommon StreamPCM StreamNonTunnel StreamInCall StreamHaptic StreamCompress StreamASR StreamACD StreamCallTranslation
58
endif
9+
endif

0 commit comments

Comments
 (0)