utils: move sofprobeclient to separate subdirectory

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/.gitignore b/.gitignore
index 6831c3d85bbac7fe1dcf1050dc11447da3c373a6..d76654067760563ce7da97e1d06834a566765cdf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ m4/lt~obsolete.m4
 cplay
 crecord
 fcplay
+sofprobeclient
 
 # other ignores
 *.patch

diff --git a/configure.ac b/configure.ac
index f3c7c3238b9704c264dd67f647a8e091c76d188c..fc7e68fd139379c7dcb480882084de96ca4594cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ include/Makefile
 src/Makefile
 src/lib/Makefile
 src/utils/Makefile
+src/utils/sofprobeclient/Makefile
 src/utils-lgpl/Makefile
 tinycompress.pc])
 AC_OUTPUT

diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 9c833629419ac21e336e3a1ddb883696272cb339..53937b9f1c2fcb6d577ffd875440b3f0ea0f47ff 100644 (file)
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -1,14 +1,13 @@
-bin_PROGRAMS = cplay crecord sofprobeclient
+SUBDIRS=sofprobeclient
+
+bin_PROGRAMS = cplay crecord
 
 cplay_SOURCES = cplay.c wave.c
 crecord_SOURCES = crecord.c wave.c
-sofprobeclient_SOURCES = sofprobeclient.c probes_demux.c
 
 cplay_CFLAGS = -I$(top_srcdir)/include
 crecord_CFLAGS = -I$(top_srcdir)/include
-sofprobeclient_CFLAGS = -I$(top_srcdir)/include
 
 
 cplay_LDADD = $(top_builddir)/src/lib/libtinycompress.la
 crecord_LDADD = $(top_builddir)/src/lib/libtinycompress.la
-sofprobeclient_LDADD = $(top_builddir)/src/lib/libtinycompress.la

diff --git a/src/utils/sofprobeclient/Makefile.am b/src/utils/sofprobeclient/Makefile.am
new file mode 100644 (file)
index 0000000..f60614c
--- /dev/null
+++ b/src/utils/sofprobeclient/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS = sofprobeclient
+
+noinst_HEADERS = probe_dma_frame.h probes_demux.h probes_wave.h
+
+sofprobeclient_SOURCES = sofprobeclient.c probes_demux.c
+
+sofprobeclient_CFLAGS = -I$(top_srcdir)/include
+
+sofprobeclient_LDADD = $(top_builddir)/src/lib/libtinycompress.la

diff --git a/src/utils/probe_dma_frame.h b/src/utils/sofprobeclient/probe_dma_frame.h
similarity index 100%
rename from src/utils/probe_dma_frame.h
rename to src/utils/sofprobeclient/probe_dma_frame.h

diff --git a/src/utils/probes_demux.c b/src/utils/sofprobeclient/probes_demux.c
similarity index 100%
rename from src/utils/probes_demux.c
rename to src/utils/sofprobeclient/probes_demux.c

diff --git a/src/utils/probes_demux.h b/src/utils/sofprobeclient/probes_demux.h
similarity index 100%
rename from src/utils/probes_demux.h
rename to src/utils/sofprobeclient/probes_demux.h

diff --git a/src/utils/probes_wave.h b/src/utils/sofprobeclient/probes_wave.h
similarity index 100%
rename from src/utils/probes_wave.h
rename to src/utils/sofprobeclient/probes_wave.h

diff --git a/src/utils/sofprobeclient.c b/src/utils/sofprobeclient/sofprobeclient.c
similarity index 100%
rename from src/utils/sofprobeclient.c
rename to src/utils/sofprobeclient/sofprobeclient.c