OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: fix install and dist build targets. 

Make install/dist were missing some headers files and dirs. Add them and
make sure version generation works for building from the dist directory
where there is no git versioning information available.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
This commit is contained in:
Liam Girdwood 2018-01-10 17:36:41 +00:00
parent 1a8a653af8
commit b14e852bbe
21 changed files with 195 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -2,6 +2,8 @@ SUBDIRS = src
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = version.sh
SRC_DIR = $(abs_top_builddir)/src
export REEF_INCDIR = \
@ -15,13 +17,8 @@ export ARCH_INCDIR = \
export PLATFORM_INCDIR = \
-I $(SRC_DIR)/platform/$(PLATFORM)/include
BUILT_SOURCES = $(top_srcdir)/src/include/version.h
$(top_srcdir)/src/include/version.h: Makefile
./git-version.sh
dist-hook:
./git-version.sh
./version.sh $(top_srcdir)
cat .version > $(distdir)/.tarball-version
cat .version > $(distdir)/.version

8
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.69])
AC_INIT([Reef],[m4_esyscmd(./git-version.sh)],[sound-open-firmware@alsa-project.org])
AC_INIT([Reef],[m4_esyscmd(./version.sh)],[sound-open-firmware@alsa-project.org])
AC_CONFIG_SRCDIR([src/init/init.c])
AC_CONFIG_HEADERS([src/include/config.h])
AC_CONFIG_MACRO_DIRS([m4])
@ -154,6 +154,9 @@ AC_CONFIG_FILES([
src/arch/Makefile
src/arch/xtensa/Makefile
src/arch/xtensa/include/Makefile
src/arch/xtensa/include/arch/Makefile
src/arch/xtensa/include/xtensa/Makefile
src/arch/xtensa/include/xtensa/config/Makefile
src/arch/xtensa/hal/Makefile
src/arch/xtensa/xtos/Makefile
src/audio/Makefile
@ -162,6 +165,9 @@ AC_CONFIG_FILES([
src/include/Makefile
src/include/reef/Makefile
src/include/reef/audio/Makefile
src/include/reef/audio/coefficients/Makefile
src/include/reef/audio/coefficients/src/Makefile
src/include/reef/math/Makefile
src/include/uapi/Makefile
src/ipc/Makefile
src/lib/Makefile

24
git-version.sh
View File

@ -1,24 +0,0 @@
# version for configure
# echo -n `git describe --abbrev=4`
# version for make dist
git describe --abbrev=4 > .version
git describe --abbrev=4 > .tarball-version
# git commit for IPC
echo "#define REEF_TAG \"`git log --pretty=format:\"%h\" -1 | cut -c1-5`\"" > src/include/version.h
# build counter
if [ -e .build ]; then
num=$((`cat .build` + 1))
else
num=0
fi
# save and insert build counter
echo $num > .build
echo "#define REEF_BUILD $num" >> src/include/version.h
#echo version for AC_INIT
echo -n `cat .version | cut -dv -f2 | cut -d. -f1`:`cat .version | cut -d. -f2 | cut -d- -f1`

2
src/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = init math audio platform tasks drivers ipc lib arch
SUBDIRS = include init math audio platform tasks drivers ipc lib arch

5
src/arch/xtensa/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = hal xtos include
bin_PROGRAMS = \
noinst_PROGRAMS = \
reef
# generate linker script from platform headers
@ -79,3 +79,6 @@ vminstall-local:
clean-local:
rm -f reef-*.bin
rm -fr *.lst
rm -fr *.map
rm -fr *.dis

2
src/arch/xtensa/hal/Makefile.am
View File

@ -134,7 +134,7 @@ PLATFORM_DEFS = \
$(CACHE_DEFS)
endif
lib_LIBRARIES = libhal.a
noinst_LIBRARIES = libhal.a
libhal_a_SOURCES = \
attribute.c \

13
src/arch/xtensa/include/Makefile.am
View File

@ -1,12 +1 @@
noinst_HEADERS = \
xtensa/cacheasm.h \
xtensa/coreasm.h \
xtensa/corebits.h \
xtensa/hal.h \
xtensa/xtensa-xer.h \
xtensa/config/core.h \
arch/interrupt.h \
arch/reef.h \
arch/spinlock.h \
arch/timer.h \
arch/task.h
SUBDIRS = arch xtensa

7
src/arch/xtensa/include/arch/Makefile.am Normal file
View File

@ -0,0 +1,7 @@
noinst_HEADERS = \
cache.h \
interrupt.h \
reef.h \
spinlock.h \
task.h \
timer.h

33
src/arch/xtensa/include/xtensa/Makefile.am Normal file
View File

@ -0,0 +1,33 @@
noinst_HEADERS = \
board.h \
config \
hal.h \
overlay.h \
trax-api.h \
trax-proto.h \
xdm-regs.h \
xtensa-versions.h \
xtruntime.h \
c6x-compat.h \
coreasm.h \
overlay_os_asm.h \
trax-core-config.h \
traxreg.h \
xmon.h \
xtensa-xer.h \
cacheasm.h \
corebits.h \
simboard.h \
traxfile.h \
trax-util.h \
xtbsp.h \
xtruntime-core-state.h \
cacheattrasm.h \
core-macros.h \
specreg.h \
trax.h \
uart-16550.h \
xtensa-libdb-macros.h \
xtruntime-frames.h
SUBDIRS = config

2
src/arch/xtensa/include/xtensa/config/Makefile.am Normal file
View File

@ -0,0 +1,2 @@
noinst_HEADERS = \
core.h

11
src/arch/xtensa/xtos/Makefile.am
View File

@ -1,4 +1,11 @@
lib_LIBRARIES = \
noinst_HEADERS = \
xtos-internal.h \
xtos-params.h \
interrupt-pri.h \
window-vectors-new.S \
int-medpri-dispatcher.S
noinst_LIBRARIES = \
libxtos.a \
libxlevel2.a \
libxlevel3.a \
@ -26,7 +33,7 @@ endif
if BUILD_APOLLOLAKE
PLATFORM_DEFS = $(VECTOR_DEFS)
lib_LIBRARIES += libxlevel6.a
noinst_LIBRARIES += libxlevel6.a
VECTOR_DEFS += -D__SPLIT__level6
endif

8
src/audio/Makefile.am
View File

@ -1,5 +1,13 @@
noinst_LIBRARIES = libaudio.a
noinst_HEADERS = \
eq_fir.h \
eq_iir.h \
fir.h \
iir.h \
src_config.h \
src_core.h
libaudio_a_SOURCES = \
eq_iir.c \
iir.c \

7
src/include/Makefile.am
View File

@ -1 +1,8 @@
SUBDIRS = reef uapi
version.h:
$(top_srcdir)/version.sh $(top_srcdir)
noinst_HEADERS = \
config.h \
version.h

4
src/include/reef/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS = audio
SUBDIRS = audio math
noinst_HEADERS = \
alloc.h \
@ -6,8 +6,10 @@ noinst_HEADERS = \
dai.h \
debug.h \
dma.h \
dma-trace.h \
dw-dma.h \
init.h \
intel-ipc.h \
interrupt.h \
interrupt-map.h \
io.h \

5
src/include/reef/audio/Makefile.am
View File

@ -1,4 +1,7 @@
SUBDIRS = coefficients
noinst_HEADERS = \
component.h \
pipeline.h \
buffer.h
buffer.h \
format.h

1
src/include/reef/audio/coefficients/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = src

58
src/include/reef/audio/coefficients/src/Makefile.am Normal file
View File

@ -0,0 +1,58 @@
noinst_HEADERS = \
src_small_int24_1_2_4375_5000.h \
src_small_int24_1_3_2188_5000.h \
src_small_int24_1_3_4375_5000.h \
src_small_int24_20_21_4020_5000.h \
src_small_int24_21_20_4020_5000.h \
src_small_int24_2_1_4375_5000.h \
src_small_int24_2_3_4375_5000.h \
src_small_int24_3_1_2188_5000.h \
src_small_int24_3_1_4375_5000.h \
src_small_int24_3_2_4375_5000.h \
src_small_int24_7_8_4375_5000.h \
src_small_int24_8_7_4375_5000.h \
src_small_int24_define.h \
src_small_int24_table.h \
src_std_int24_10_21_4375_5000.h \
src_std_int24_10_9_4375_5000.h \
src_std_int24_1_2_2188_5000.h \
src_std_int24_1_2_4375_5000.h \
src_std_int24_1_3_2188_5000.h \
src_std_int24_1_3_4375_5000.h \
src_std_int24_16_7_3938_5000.h \
src_std_int24_20_21_4020_5000.h \
src_std_int24_20_7_2871_5000.h \
src_std_int24_21_20_4020_5000.h \
src_std_int24_2_1_2188_5000.h \
src_std_int24_21_40_3828_5000.h \
src_std_int24_2_1_4375_5000.h \
src_std_int24_21_80_3828_5000.h \
src_std_int24_2_3_4375_5000.h \
src_std_int24_3_1_2188_5000.h \
src_std_int24_3_1_4375_5000.h \
src_std_int24_32_21_4375_5000.h \
src_std_int24_3_2_4375_5000.h \
src_std_int24_3_4_4375_5000.h \
src_std_int24_40_21_3828_5000.h \
src_std_int24_4_3_4375_5000.h \
src_std_int24_5_7_4375_5000.h \
src_std_int24_7_8_4375_5000.h \
src_std_int24_8_21_3125_5000.h\
src_std_int24_8_7_2381_5000.h \
src_std_int24_8_7_4375_5000.h \
src_std_int24_define.h \
src_std_int24_table.h \
src_tiny_int16_1_2_3750_5100.h \
src_tiny_int16_1_3_1875_5100.h \
src_tiny_int16_1_3_3750_5100.h \
src_tiny_int16_20_21_3445_5100.h \
src_tiny_int16_21_20_3445_5100.h \
src_tiny_int16_2_1_3750_5100.h \
src_tiny_int16_2_3_3750_5100.h \
src_tiny_int16_3_1_1875_5100.h \
src_tiny_int16_3_1_3750_5100.h \
src_tiny_int16_3_2_3750_5100.h \
src_tiny_int16_7_8_3750_5100.h \
src_tiny_int16_8_7_3750_5100.h \
src_tiny_int16_define.h \
src_tiny_int16_table.h

3
src/include/reef/math/Makefile.am Normal file
View File

@ -0,0 +1,3 @@
noinst_HEADERS = \
numbers.h \
trig.h

2
src/platform/baytrail/Makefile.am
View File

@ -1,5 +1,7 @@
SUBDIRS = include
EXTRA_DIST = baytrail.x.in
noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \

2
src/platform/baytrail/include/xtensa/config/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_HEADERS = \
core-isa.h \
core-isa-byt.h \
core-isa-cht.h \
core-matmap.h \
defs.h \
specreg.h \

39
version.sh Executable file
View File

@ -0,0 +1,39 @@
# version for configure, make dist and FW etc
# usage "version.sh dir"
# Where dir is the top level directory path.
# use pwd is no path argument is given
if [ $# -eq 0 ]; then
DIR=`pwd`
else
DIR=$1
fi
# create git version if we are a git repo
if [ ! -d $DIR/.git ]; then
# version for make dist
git describe --abbrev=4 > $DIR/.version
git describe --abbrev=4 > $DIR/.tarball-version
# git commit for IPC
echo "#define REEF_TAG \"`git log --pretty=format:\"%h\" -1 | cut -c1-5`\"" > $DIR/src/include/version.h
else
echo "#define REEF_TAG 0" > $DIR/src/include/version.h
fi
# build counter
if [ -e $DIR/.build ]; then
num=$((`cat $DIR/.build` + 1))
else
num=0
fi
# save and insert build counter
echo $num > $DIR/.build
echo "#define REEF_BUILD $num" >> $DIR/src/include/version.h
#echo version for AC_INIT
if [ -e $DIR/.version ]; then
echo -n `cat $DIR/.version | cut -dv -f2 | cut -d. -f1`.`cat $DIR/.version | cut -d. -f2 | cut -d- -f1`
fi