Merge branch '1.0-stable'

# Conflicts:
#	topology/test/tplg-build.sh

configure.ac

@@ -1,6 +1,6 @@
 
 AC_PREREQ([2.69])
-AC_INIT([rimage], [0.1])
+AC_INIT([sof-tools], [1.0.1])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([rimage/rimage.c])
 AC_CONFIG_HEADERS([config.h])
@@ -17,6 +17,10 @@ AC_OUTPUT([
 	rimage/Makefile
 	rmbox/Makefile
 	topology/Makefile
+	topology/common/Makefile
+	topology/dsps/Makefile
+	topology/m4/Makefile
+	topology/sof/Makefile
 	topology/test/Makefile
 ])
 

topology/Makefile.am

@@ -3,7 +3,7 @@
 # Dependencies
 #
 
-SUBDIRS = test
+SUBDIRS = test m4 sof common dsps
 
 DEPS = \
 	dsps/*.m4 \
@@ -44,3 +44,16 @@ clean:
 	rm -f *.conf
 	rm -f *.tplg
 
+EXTRA_DIST = \
+	reef-cht-nocodec.m4 \
+	reef-cht-max98090.m4 \
+	reef-apl-nocodec.m4 \
+	reef-bxt-nocodec.m4 \
+	reef-byt-nocodec.m4 \
+	reef-bdw-rt286.m4 \
+	reef-bdw-rt5640.m4 \
+	reef-byt-rt5640.m4 \
+	reef-byt-rt5645.m4 \
+	reef-byt-rt5651.m4 \
+	reef-byt-da7212.m4 \
+	reef-hsw-rt5640.m4

topology/common/Makefile.am

@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	tlv.m4
+

topology/dsps/Makefile.am

@@ -0,0 +1,7 @@
+EXTRA_DIST = \
+	bdw.m4 \
+	bxt.m4 \
+	byt.m4 \
+	cht.m4 \
+	hsw.m4
+

topology/m4/Makefile.am

@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	build.m4 \
+	local.m4

topology/sof/Makefile.am

@@ -0,0 +1,14 @@
+EXTRA_DIST = \
+	pipe-dai-capture.m4 \
+	pipe-dai-playback.m4 \
+	pipe-low-latency-capture.m4 \
+	pipe-low-latency-playback.m4 \
+	pipe-passthrough-capture.m4 \
+	pipe-passthrough-playback.m4 \
+	pipe-pcm-media.m4 \
+	pipe-src-capture.m4 \
+	pipe-src-playback.m4 \
+	pipe-tone.m4 \
+	pipe-volume-capture.m4 \
+	pipe-volume-playback.m4 \
+	tokens.m4

topology/test/Makefile.am

@@ -3,6 +3,8 @@
 # Dependencies
 #
 
+
+
 DEPS = \
 	../dsps/*.m4 \
 	../common/*.m4 \
@@ -18,3 +20,10 @@ all : *.m4 ${DEPS}
 clean:
 	rm -f *.conf
 	rm -f *.tplg
+
+
+EXTRA_DIST = \
+	test-capture-ssp.m4 \
+	test-playback-ssp.m4 \
+	test-ssp.m4 \
+	tplg-build.sh