build: remove libwebpmux from default targets/config

the extended file format is still under development and related
libs/binaries are not fit for release

configure:
--enable/disable-libwebpmux; default is disabled.

makefile.unix:
src/mux/libwebpmux.a and examples/webpmux must be explicitly specified

Makefile.vc:
$(DIRLIB)\libwebpmux.lib and $(DIRBIN)\webpmux.exe must be explicitly
specified

Change-Id: I8246746b256010dd2a2e4de58291222d7eaf0457

Android.mk

@@ -35,10 +35,6 @@ LOCAL_SRC_FILES := \
     src/enc/syntax.c \
     src/enc/tree.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_writer.c \
     src/utils/color_cache.c \

Makefile.vc

@@ -203,13 +203,14 @@ UTILS_OBJS = \
 LIBWEBP_OBJS = $(DEC_OBJS) $(DSP_OBJS) $(ENC_OBJS) $(UTILS_OBJS) $(LIBWEBP_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)
 $(DIRBIN)\cwebp.exe: $(DIROBJ)\examples\cwebp.obj
 $(DIRBIN)\dwebp.exe: $(DIROBJ)\examples\dwebp.obj
 $(DIRBIN)\webpmux.exe: $(DIROBJ)\examples\webpmux.obj $(LIBWEBPMUX)
+$(DIRBIN)\webpmux.exe: $(EX_UTIL_OBJS) $(LIBWEBP)
 $(OUT_EXAMPLES): $(EX_UTIL_OBJS) $(LIBWEBP)
 
 experimental:

configure.ac

@@ -183,6 +183,14 @@ fi
 AC_MSG_RESULT(${enable_experimental-no})
 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 =========================
 
 AC_CONFIG_MACRO_DIR([m4])

examples/Makefile.am

@@ -1,6 +1,9 @@
 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
 
 libexampleutil_la_SOURCES = example_util.c

makefile.unix

@@ -159,10 +159,13 @@ HDRS = \
     src/webp/mux.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
 

man/Makefile.am

@@ -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)

src/Makefile.am

@@ -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
 lib_LTLIBRARIES = libwebp.la