diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-16 10:09:41 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-17 08:20:58 +0200 |
| commit | 36adfb6efc2c1b1a1a14dfe7a699a4049c1373e5 (patch) | |
| tree | 9b3838892d00f1ef48f8fe5309b447a3e1b99917 | |
| parent | 7e10bfb370a87cb46082e61abfcd5eb909d3d1c2 (diff) | |
| download | ptxdist-36adfb6efc2c1b1a1a14dfe7a699a4049c1373e5.tar.gz ptxdist-36adfb6efc2c1b1a1a14dfe7a699a4049c1373e5.tar.xz | |
vorbis-tools: don't build tools that aren't installed
This avoids build errors when dependencies for those tools are missing.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/vorbis-tools.in | 7 | ||||
| -rw-r--r-- | rules/vorbis-tools.make | 15 |
2 files changed, 20 insertions, 2 deletions
diff --git a/rules/vorbis-tools.in b/rules/vorbis-tools.in index 2079cfb55..2061fd1e2 100644 --- a/rules/vorbis-tools.in +++ b/rules/vorbis-tools.in @@ -6,7 +6,7 @@ menuconfig VORBIS_TOOLS select LIBOGG select LIBVORBIS select LIBAO if VORBIS_TOOLS_OGG123 - select FLAC if VORBIS_TOOLS_OGG123 || VORBIS_TOOLS_OGGENC + select FLAC if VORBIS_TOOLS_FLAC select SPEEX if VORBIS_TOOLS_OGG123 select SPEEX_FLOAT_API if VORBIS_TOOLS_OGG123 help @@ -14,8 +14,12 @@ menuconfig VORBIS_TOOLS if VORBIS_TOOLS +config VORBIS_TOOLS_FLAC + bool + config VORBIS_TOOLS_OGG123 bool "ogg123" + select VORBIS_TOOLS_FLAC help ogg123 (a playback tool) @@ -26,6 +30,7 @@ config VORBIS_TOOLS_OGGDEC config VORBIS_TOOLS_OGGENC bool "oggenc" + select VORBIS_TOOLS_FLAC help oggenc (an encoder) diff --git a/rules/vorbis-tools.make b/rules/vorbis-tools.make index 54032ea5e..ef811ef9d 100644 --- a/rules/vorbis-tools.make +++ b/rules/vorbis-tools.make @@ -35,7 +35,20 @@ VORBIS_TOOLS_LICENSE := GPLv2 VORBIS_TOOLS_CONF_TOOL := autoconf VORBIS_TOOLS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-threads \ + --disable-rpath \ $(GLOBAL_LARGE_FILE_OPTION) \ + --$(call ptx/endis, PTXCONF_VORBIS_TOOLS_OGG123)-ogg123 \ + --$(call ptx/endis, PTXCONF_VORBIS_TOOLS_OGGDEC)-oggdec \ + --$(call ptx/endis, PTXCONF_VORBIS_TOOLS_OGGENC)-oggenc \ + --$(call ptx/endis, PTXCONF_VORBIS_TOOLS_OGGINFO)-ogginfo \ + --$(call ptx/endis, PTXCONF_VORBIS_TOOLS_VCUT)-vcut \ + --$(call ptx/endis, PTXCONF_VORBIS_TOOLS_VORBISCOMMENT)-vorbiscomment \ + --disable-oggtest \ + --disable-vorbistest \ + --disable-curltest \ + --$(call ptx/wwo, PTXCONF_VORBIS_TOOLS_FLAC)-flac \ + --$(call ptx/wwo, PTXCONF_VORBIS_TOOLS_OGG123)-speex \ --without-kate \ --without-curl @@ -43,7 +56,7 @@ VORBIS_TOOLS_CONF_OPT := \ # Target-Install # ---------------------------------------------------------------------------- -VORBIS_TOOLS_PROGS := +VORBIS_TOOLS_PROGS_y := VORBIS_TOOLS_PROGS_$(PTXCONF_VORBIS_TOOLS_OGG123) += ogg123 VORBIS_TOOLS_PROGS_$(PTXCONF_VORBIS_TOOLS_OGGDEC) += oggdec VORBIS_TOOLS_PROGS_$(PTXCONF_VORBIS_TOOLS_OGGENC) += oggenc |