From d7ce4a2e3e57cd6fde8a5569b78c37ee61edc1e2 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Jul 2016 00:26:27 -0700 Subject: [PATCH] examples/Makefile.am,cosmetics: sort binary targets Change-Id: I1a592bfcdf55b41814eaf971b43a773c26fbb651 --- examples/Makefile.am | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 19102bb3..7618d7fc 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,19 +1,17 @@ AM_CPPFLAGS += -I$(top_builddir)/src -I$(top_srcdir)/src bin_PROGRAMS = dwebp cwebp -if BUILD_VWEBP - bin_PROGRAMS += vwebp +if BUILD_ANIMDIFF + noinst_PROGRAMS = anim_diff +endif +if BUILD_GIF2WEBP + bin_PROGRAMS += gif2webp endif if WANT_MUX bin_PROGRAMS += webpmux endif - -if BUILD_GIF2WEBP - bin_PROGRAMS += gif2webp -endif - -if BUILD_ANIMDIFF - noinst_PROGRAMS = anim_diff +if BUILD_VWEBP + bin_PROGRAMS += vwebp endif noinst_LTLIBRARIES = libexample_util.la @@ -27,6 +25,12 @@ anim_diff_LDADD = ../src/demux/libwebpdemux.la anim_diff_LDADD += libexample_util.la ../imageio/libimageio_util.la anim_diff_LDADD += $(GIF_LIBS) -lm +cwebp_SOURCES = cwebp.c stopwatch.h +cwebp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) +cwebp_LDADD = libexample_util.la ../imageio/libimageio_util.la +cwebp_LDADD += ../imageio/libimagedec.la ../src/libwebp.la +cwebp_LDADD += $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) + dwebp_SOURCES = dwebp.c stopwatch.h dwebp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) dwebp_CPPFLAGS += $(JPEG_INCLUDES) $(PNG_INCLUDES) @@ -34,27 +38,21 @@ dwebp_LDADD = libexample_util.la ../imageio/libimageio_util.la dwebp_LDADD += ../imageio/libimagedec.la ../src/libwebp.la dwebp_LDADD +=$(PNG_LIBS) $(JPEG_LIBS) -cwebp_SOURCES = cwebp.c stopwatch.h -cwebp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) -cwebp_LDADD = libexample_util.la ../imageio/libimageio_util.la -cwebp_LDADD += ../imageio/libimagedec.la ../src/libwebp.la -cwebp_LDADD += $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) - gif2webp_SOURCES = gif2webp.c gifdec.c gifdec.h gif2webp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) $(GIF_INCLUDES) gif2webp_LDADD = libexample_util.la ../imageio/libimageio_util.la gif2webp_LDADD += ../src/mux/libwebpmux.la ../src/libwebp.la $(GIF_LIBS) -webpmux_SOURCES = webpmux.c -webpmux_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) -webpmux_LDADD = libexample_util.la ../imageio/libimageio_util.la -webpmux_LDADD += ../src/mux/libwebpmux.la ../src/libwebp.la - vwebp_SOURCES = vwebp.c vwebp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) $(GL_INCLUDES) vwebp_LDADD = libexample_util.la ../imageio/libimageio_util.la vwebp_LDADD += ../src/demux/libwebpdemux.la $(GL_LIBS) +webpmux_SOURCES = webpmux.c +webpmux_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) +webpmux_LDADD = libexample_util.la ../imageio/libimageio_util.la +webpmux_LDADD += ../src/mux/libwebpmux.la ../src/libwebp.la + if BUILD_LIBWEBPDECODER anim_diff_LDADD += ../src/libwebpdecoder.la vwebp_LDADD += ../src/libwebpdecoder.la