Fixed few nits in the build files.

Fixed the nits from last change (Provide an option to build decoder
library).

Change-Id: I7d8675b8156dc63cf21ef64810722552e7fb59f6
This commit is contained in:
Vikas Arora 2013-01-23 13:20:56 -08:00
parent 9161be863d
commit a941a3463e
3 changed files with 2 additions and 4 deletions

View File

@ -272,7 +272,7 @@ dnl === Check whether decoder library should be built.
AC_MSG_CHECKING(whether decoder library is to be built) AC_MSG_CHECKING(whether decoder library is to be built)
AC_ARG_ENABLE([libwebpdecoder], AC_ARG_ENABLE([libwebpdecoder],
AS_HELP_STRING([--enable-libwebpdecoder], AS_HELP_STRING([--enable-libwebpdecoder],
[Building libwebpdecoder @<:@default=no@:>@])) [Build libwebpdecoder @<:@default=no@:>@]))
AC_MSG_RESULT(${enable_libwebpdecoder-no}) AC_MSG_RESULT(${enable_libwebpdecoder-no})
AM_CONDITIONAL([BUILD_LIBWEBPDECODER], [test "$enable_libwebpdecoder" = "yes"]) AM_CONDITIONAL([BUILD_LIBWEBPDECODER], [test "$enable_libwebpdecoder" = "yes"])

View File

@ -1,7 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
bin_PROGRAMS = dwebp cwebp bin_PROGRAMS = dwebp cwebp
if WANT_MUX if WANT_MUX
bin_PROGRAMS += webpmux bin_PROGRAMS += webpmux
endif endif

View File

@ -1,5 +1,4 @@
SUBDIRS = dec enc dsp utils SUBDIRS = dec enc dsp utils
if WANT_MUX if WANT_MUX
SUBDIRS += mux SUBDIRS += mux
endif endif
@ -46,7 +45,7 @@ if BUILD_LIBWEBPDECODER
libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la
libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.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 libwebpdecoderincludedir = $(includedir)/webp
endif endif