dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "build: remove libwebpmux from default targets/config"

Browse Source
This commit is contained in:
James Zern 2012-07-13 11:33:52 -07:00 committed by Gerrit Code Review
commit 8130c4cc64
7 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -35,10 +35,6 @@ LOCAL_SRC_FILES := \
src/enc/syntax.c \ src/enc/syntax.c \
src/enc/tree.c \ src/enc/tree.c \
src/enc/webpenc.c \ src/enc/webpenc.c \
src/mux/demux.c \
src/mux/muxedit.c \
src/mux/muxinternal.c \
src/mux/muxread.c \
src/utils/bit_reader.c \ src/utils/bit_reader.c \
src/utils/bit_writer.c \ src/utils/bit_writer.c \
src/utils/color_cache.c \ src/utils/color_cache.c \

5
Makefile.vc
View File

@ -203,13 +203,14 @@ UTILS_OBJS = \
LIBWEBP_OBJS = $(DEC_OBJS) $(DSP_OBJS) $(ENC_OBJS) $(UTILS_OBJS) $(LIBWEBP_OBJS) LIBWEBP_OBJS = $(DEC_OBJS) $(DSP_OBJS) $(ENC_OBJS) $(UTILS_OBJS) $(LIBWEBP_OBJS)
LIBWEBPMUX_OBJS = $(MUX_OBJS) $(LIBWEBPMUX_OBJS) LIBWEBPMUX_OBJS = $(MUX_OBJS) $(LIBWEBPMUX_OBJS)
OUT_LIBS = $(LIBWEBP) $(LIBWEBPMUX) OUT_LIBS = $(LIBWEBP)
OUT_EXAMPLES = $(DIRBIN)\cwebp.exe $(DIRBIN)\dwebp.exe $(DIRBIN)\webpmux.exe OUT_EXAMPLES = $(DIRBIN)\cwebp.exe $(DIRBIN)\dwebp.exe
all: $(OUT_LIBS) $(OUT_EXAMPLES) all: $(OUT_LIBS) $(OUT_EXAMPLES)
$(DIRBIN)\cwebp.exe: $(DIROBJ)\examples\cwebp.obj $(DIRBIN)\cwebp.exe: $(DIROBJ)\examples\cwebp.obj
$(DIRBIN)\dwebp.exe: $(DIROBJ)\examples\dwebp.obj $(DIRBIN)\dwebp.exe: $(DIROBJ)\examples\dwebp.obj
$(DIRBIN)\webpmux.exe: $(DIROBJ)\examples\webpmux.obj $(LIBWEBPMUX) $(DIRBIN)\webpmux.exe: $(DIROBJ)\examples\webpmux.obj $(LIBWEBPMUX)
$(DIRBIN)\webpmux.exe: $(EX_UTIL_OBJS) $(LIBWEBP)
$(OUT_EXAMPLES): $(EX_UTIL_OBJS) $(LIBWEBP) $(OUT_EXAMPLES): $(EX_UTIL_OBJS) $(LIBWEBP)
experimental: experimental:

8
configure.ac
View File

@ -209,6 +209,14 @@ fi
AC_MSG_RESULT(${enable_experimental-no}) AC_MSG_RESULT(${enable_experimental-no})
AC_SUBST(USE_EXPERIMENTAL_CODE) AC_SUBST(USE_EXPERIMENTAL_CODE)
dnl === Check whether libwebpmux should be built
AC_MSG_CHECKING(whether libwebpmux is to be built)
AC_ARG_ENABLE([experimental-libwebpmux],
AS_HELP_STRING([--enable-experimental-libwebpmux],
[Build libwebpmux @<:@default=no@:>@]))
AC_MSG_RESULT(${enable_experimental_libwebpmux-no})
AM_CONDITIONAL([WANT_MUX], [test "$enable_experimental_libwebpmux" = "yes"])
dnl ========================= dnl =========================
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

5
examples/Makefile.am
View File

@ -1,6 +1,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
bin_PROGRAMS = dwebp cwebp webpmux bin_PROGRAMS = dwebp cwebp
if WANT_MUX
bin_PROGRAMS += webpmux
endif
noinst_LTLIBRARIES = libexampleutil.la noinst_LTLIBRARIES = libexampleutil.la
libexampleutil_la_SOURCES = example_util.c libexampleutil_la_SOURCES = example_util.c

9
makefile.unix
View File

@ -159,10 +159,13 @@ HDRS = \
src/webp/mux.h \ src/webp/mux.h \
src/webp/types.h \ src/webp/types.h \
OUT_LIBS = examples/libexample_util.a src/libwebp.a src/mux/libwebpmux.a OUT_LIBS = examples/libexample_util.a src/libwebp.a
OUT_EXAMPLES = examples/cwebp examples/dwebp examples/webpmux OUT_EXAMPLES = examples/cwebp examples/dwebp
OUTPUT = $(OUT_LIBS) $(OUT_EXAMPLES) examples/vwebp OUTPUT = $(OUT_LIBS) $(OUT_EXAMPLES)
ifeq ($(MAKECMDGOALS),clean)
OUTPUT += examples/vwebp examples/webpmux src/mux/libwebpmux.a
endif
all: ex all: ex

5
man/Makefile.am
View File

@ -1,2 +1,5 @@
man_MANS = cwebp.1 dwebp.1 webpmux.1 man_MANS = cwebp.1 dwebp.1
if WANT_MUX
man_MANS += webpmux.1
endif
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)

5
src/Makefile.am
View File

@ -1,4 +1,7 @@
SUBDIRS = dec enc dsp utils mux SUBDIRS = dec enc dsp utils
if WANT_MUX
SUBDIRS += mux
endif
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
lib_LTLIBRARIES = libwebp.la lib_LTLIBRARIES = libwebp.la