From a941a3463eadce23eab93978096c3aa7b41cc42b Mon Sep 17 00:00:00 2001 From: Vikas Arora Date: Wed, 23 Jan 2013 13:20:56 -0800 Subject: [PATCH] Fixed few nits in the build files. Fixed the nits from last change (Provide an option to build decoder library). Change-Id: I7d8675b8156dc63cf21ef64810722552e7fb59f6 --- configure.ac | 2 +- examples/Makefile.am | 1 - src/Makefile.am | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ddb7c8fa..9fc83f88 100644 --- a/configure.ac +++ b/configure.ac @@ -272,7 +272,7 @@ dnl === Check whether decoder library should be built. AC_MSG_CHECKING(whether decoder library is to be built) AC_ARG_ENABLE([libwebpdecoder], AS_HELP_STRING([--enable-libwebpdecoder], - [Building libwebpdecoder @<:@default=no@:>@])) + [Build libwebpdecoder @<:@default=no@:>@])) AC_MSG_RESULT(${enable_libwebpdecoder-no}) AM_CONDITIONAL([BUILD_LIBWEBPDECODER], [test "$enable_libwebpdecoder" = "yes"]) diff --git a/examples/Makefile.am b/examples/Makefile.am index d5916c70..0a50f50b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,7 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src bin_PROGRAMS = dwebp cwebp - if WANT_MUX bin_PROGRAMS += webpmux endif diff --git a/src/Makefile.am b/src/Makefile.am index 7cd031ce..ba4b7f41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = dec enc dsp utils - if WANT_MUX SUBDIRS += mux endif @@ -46,7 +45,7 @@ if BUILD_LIBWEBPDECODER libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.la - libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 4:1:0 + libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 0:0:0 libwebpdecoderincludedir = $(includedir)/webp endif