Skip to content

Commit 817dada

Browse files
committed
platform: use lt library for cavs shared sources
Wraps common code into libtool convinence libs, because we don't want to list common source files for each platform with relative paths. Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
1 parent d886a61 commit 817dada

6 files changed

Lines changed: 40 additions & 35 deletions

File tree

src/arch/xtensa/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ sof_LDADD = \
8787
../../init/libinit.a \
8888
../../tasks/libtasks.a \
8989
../../lib/libcore.a \
90-
../../platform/$(PLATFORM)/libplatform.a \
90+
../../platform/$(PLATFORM)/libplatform.la \
9191
../../ipc/libsof_ipc.a \
9292
../../lib/libdma.a \
9393
../../audio/libaudio.a \

src/platform/apollolake/Makefile.am

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,19 @@ EXTRA_DIST = \
44
apollolake.x.in \
55
boot_ldr.x.in
66

7-
noinst_LIBRARIES = libplatform.a
8-
9-
libplatform_a_SOURCES = \
10-
../intel/cavs/platform.c \
11-
../intel/cavs/dai.c \
12-
../intel/cavs/dma.c \
13-
../intel/cavs/clk.c \
14-
../intel/cavs/timer.c \
15-
../intel/cavs/interrupt.c \
16-
../intel/cavs/memory.c \
17-
../intel/cavs/pm_runtime.c \
18-
power_down.S
19-
20-
libplatform_a_CFLAGS = \
7+
noinst_LTLIBRARIES = libplatform.la
8+
9+
libplatform_la_LIBADD = ../intel/cavs/libcavsplatform.la
10+
11+
libplatform_la_SOURCES = power_down.S
12+
13+
libplatform_la_CFLAGS = \
2114
$(ARCH_CFLAGS) \
2215
$(ARCH_INCDIR) \
2316
$(PLATFORM_INCDIR) \
2417
$(SOF_INCDIR)
2518

26-
libplatform_a_CCASFLAGS = \
19+
libplatform_la_CCASFLAGS = \
2720
$(ARCH_INCDIR) \
2821
$(ASFLAGS) \
2922
$(ARCH_ASFLAGS) \

src/platform/baytrail/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ SUBDIRS = include
22

33
EXTRA_DIST = baytrail.x.in
44

5-
noinst_LIBRARIES = libplatform.a
5+
noinst_LTLIBRARIES = libplatform.la
66

7-
libplatform_a_SOURCES = \
7+
libplatform_la_SOURCES = \
88
platform.c \
99
dai.c \
1010
dma.c \
1111
clk.c \
1212
timer.c \
1313
memory.c
1414

15-
libplatform_a_CFLAGS = \
15+
libplatform_la_CFLAGS = \
1616
$(ARCH_CFLAGS) \
1717
$(ARCH_INCDIR) \
1818
$(PLATFORM_INCDIR) \

src/platform/cannonlake/Makefile.am

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@ EXTRA_DIST = \
44
cannonlake.x.in \
55
boot_ldr.x.in
66

7-
noinst_LIBRARIES = libplatform.a
8-
9-
libplatform_a_SOURCES = \
10-
../intel/cavs/platform.c \
11-
../intel/cavs/dai.c \
12-
../intel/cavs/dma.c \
13-
../intel/cavs/clk.c \
14-
../intel/cavs/timer.c \
15-
../intel/cavs/interrupt.c \
16-
../intel/cavs/memory.c \
17-
../intel/cavs/pm_runtime.c
18-
19-
libplatform_a_CFLAGS = \
7+
noinst_LTLIBRARIES = libplatform.la
8+
9+
libplatform_la_LIBADD = ../intel/cavs/libcavsplatform.la
10+
11+
libplatform_la_SOURCES =
12+
13+
libplatform_la_CFLAGS = \
2014
$(ARCH_CFLAGS) \
2115
$(ARCH_INCDIR) \
2216
$(PLATFORM_INCDIR) \

src/platform/haswell/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ SUBDIRS = include
22

33
EXTRA_DIST = haswell.x.in
44

5-
noinst_LIBRARIES = libplatform.a
5+
noinst_LTLIBRARIES = libplatform.la
66

7-
libplatform_a_SOURCES = \
7+
libplatform_la_SOURCES = \
88
platform.c \
99
dai.c \
1010
dma.c \
1111
clk.c \
1212
timer.c \
1313
memory.c
1414

15-
libplatform_a_CFLAGS = \
15+
libplatform_la_CFLAGS = \
1616
$(ARCH_CFLAGS) \
1717
$(ARCH_INCDIR) \
1818
$(PLATFORM_INCDIR) \
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
noinst_LTLIBRARIES = libcavsplatform.la
2+
3+
libcavsplatform_la_SOURCES = \
4+
platform.c \
5+
dai.c \
6+
dma.c \
7+
clk.c \
8+
timer.c \
9+
interrupt.c \
10+
memory.c \
11+
pm_runtime.c
12+
13+
libcavsplatform_la_CFLAGS = \
14+
$(AM_CFLAGS) \
15+
$(ARCH_CFLAGS) \
16+
$(ARCH_INCDIR) \
17+
$(PLATFORM_INCDIR) \
18+
$(SOF_INCDIR)

0 commit comments

Comments
 (0)