diff --git a/src/Makefile.am b/src/Makefile.am index 59e2c854..42ab37dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,15 +4,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/src lib_LTLIBRARIES = libwebp.la libwebp_la_SOURCES = -libwebp_la_LIBADD = dec/libwebpdecode.la \ - enc/libwebpencode.la \ - utils/libwebputils.la \ - dsp/libwebpdsp.la +libwebpinclude_HEADERS = +libwebpinclude_HEADERS += webp/decode.h +libwebpinclude_HEADERS += webp/decode_vp8.h +libwebpinclude_HEADERS += webp/encode.h +libwebpinclude_HEADERS += webp/types.h + +libwebp_la_LIBADD = +libwebp_la_LIBADD += dec/libwebpdecode.la +libwebp_la_LIBADD += dsp/libwebpdsp.la +libwebp_la_LIBADD += enc/libwebpencode.la +libwebp_la_LIBADD += utils/libwebputils.la + libwebp_la_LDFLAGS = -version-info 2:0:0 -libwebpinclude_HEADERS = webp/types.h webp/decode.h webp/decode_vp8.h \ - webp/encode.h libwebpincludedir = $(includedir)/webp pkgconfig_DATA = libwebp.pc - ${pkgconfig_DATA}: ${top_builddir}/config.status diff --git a/src/dec/Makefile.am b/src/dec/Makefile.am index 3a963b2d..8a17c8e9 100644 --- a/src/dec/Makefile.am +++ b/src/dec/Makefile.am @@ -1,11 +1,26 @@ AM_CPPFLAGS = -I$(top_srcdir)/src - -libwebpdecode_la_SOURCES = vp8i.h webpi.h \ - frame.c quant.c tree.c vp8.c vp8l.c webp.c \ - idec.c alpha.c layer.c io.c buffer.c -libwebpdecode_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE) -libwebpdecodeinclude_HEADERS = ../webp/decode.h ../webp/decode_vp8.h \ - ../webp/types.h ../webp/mux.h -libwebpdecodeincludedir = $(includedir)/webp - noinst_LTLIBRARIES = libwebpdecode.la + +libwebpdecode_la_SOURCES = +libwebpdecode_la_SOURCES += alpha.c +libwebpdecode_la_SOURCES += buffer.c +libwebpdecode_la_SOURCES += frame.c +libwebpdecode_la_SOURCES += idec.c +libwebpdecode_la_SOURCES += io.c +libwebpdecode_la_SOURCES += layer.c +libwebpdecode_la_SOURCES += quant.c +libwebpdecode_la_SOURCES += tree.c +libwebpdecode_la_SOURCES += vp8.c +libwebpdecode_la_SOURCES += vp8i.h +libwebpdecode_la_SOURCES += vp8l.c +libwebpdecode_la_SOURCES += webp.c +libwebpdecode_la_SOURCES += webpi.h + +libwebpdecodeinclude_HEADERS = +libwebpdecodeinclude_HEADERS += ../webp/decode.h +libwebpdecodeinclude_HEADERS += ../webp/decode_vp8.h +libwebpdecodeinclude_HEADERS += ../webp/mux.h +libwebpdecodeinclude_HEADERS += ../webp/types.h + +libwebpdecode_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE) +libwebpdecodeincludedir = $(includedir)/webp diff --git a/src/dsp/Makefile.am b/src/dsp/Makefile.am index 0014c4e8..e918ecb7 100644 --- a/src/dsp/Makefile.am +++ b/src/dsp/Makefile.am @@ -1,14 +1,23 @@ AM_CPPFLAGS = -I$(top_srcdir)/src +noinst_LTLIBRARIES = libwebpdsp.la + +libwebpdsp_la_SOURCES = +libwebpdsp_la_SOURCES += cpu.c +libwebpdsp_la_SOURCES += dec.c +libwebpdsp_la_SOURCES += dec_neon.c +libwebpdsp_la_SOURCES += dec_sse2.c +libwebpdsp_la_SOURCES += dsp.h +libwebpdsp_la_SOURCES += enc.c +libwebpdsp_la_SOURCES += enc_sse2.c +libwebpdsp_la_SOURCES += lossless.c +libwebpdsp_la_SOURCES += lossless.h +libwebpdsp_la_SOURCES += upsampling.c +libwebpdsp_la_SOURCES += upsampling_sse2.c +libwebpdsp_la_SOURCES += yuv.c +libwebpdsp_la_SOURCES += yuv.h + +libwebpdspinclude_HEADERS = ../webp/types.h -libwebpdsp_la_SOURCES = dsp.h cpu.c \ - enc.c enc_sse2.c \ - dec.c dec_sse2.c dec_neon.c \ - lossless.h lossless.c \ - upsampling.c upsampling_sse2.c \ - yuv.h yuv.c libwebpdsp_la_LDFLAGS = -lm libwebpdsp_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE) -libwebpdspinclude_HEADERS = ../webp/types.h libwebpdspincludedir = $(includedir)/webp - -noinst_LTLIBRARIES = libwebpdsp.la diff --git a/src/enc/Makefile.am b/src/enc/Makefile.am index b9a69494..5a3d293f 100644 --- a/src/enc/Makefile.am +++ b/src/enc/Makefile.am @@ -1,12 +1,28 @@ AM_CPPFLAGS = -I$(top_srcdir)/src +noinst_LTLIBRARIES = libwebpencode.la + +libwebpencode_la_SOURCES = +libwebpencode_la_SOURCES += alpha.c +libwebpencode_la_SOURCES += analysis.c +libwebpencode_la_SOURCES += config.c +libwebpencode_la_SOURCES += cost.c +libwebpencode_la_SOURCES += cost.h +libwebpencode_la_SOURCES += filter.c +libwebpencode_la_SOURCES += frame.c +libwebpencode_la_SOURCES += iterator.c +libwebpencode_la_SOURCES += layer.c +libwebpencode_la_SOURCES += picture.c +libwebpencode_la_SOURCES += quant.c +libwebpencode_la_SOURCES += syntax.c +libwebpencode_la_SOURCES += tree.c +libwebpencode_la_SOURCES += vp8enci.h +libwebpencode_la_SOURCES += webpenc.c + +libwebpencodeinclude_HEADERS = +libwebpencodeinclude_HEADERS += ../webp/encode.h +libwebpencodeinclude_HEADERS += ../webp/mux.h +libwebpencodeinclude_HEADERS += ../webp/types.h -libwebpencode_la_SOURCES = analysis.c config.c cost.c cost.h filter.c \ - frame.c iterator.c picture.c quant.c \ - syntax.c tree.c vp8enci.h webpenc.c alpha.c \ - layer.c libwebpencode_la_LDFLAGS = -lm libwebpencode_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE) -libwebpencodeinclude_HEADERS = ../webp/encode.h ../webp/types.h ../webp/mux.h libwebpencodeincludedir = $(includedir)/webp - -noinst_LTLIBRARIES = libwebpencode.la diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am index 062cf73e..bc07f7a6 100644 --- a/src/mux/Makefile.am +++ b/src/mux/Makefile.am @@ -1,8 +1,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/src lib_LTLIBRARIES = libwebpmux.la -libwebpmux_la_SOURCES = muxi.h \ - muxedit.c muxinternal.c muxread.c +libwebpmux_la_SOURCES = +libwebpmux_la_SOURCES += muxedit.c +libwebpmux_la_SOURCES += muxi.h +libwebpmux_la_SOURCES += muxinternal.c +libwebpmux_la_SOURCES += muxread.c + +libwebpmuxinclude_HEADERS = +libwebpmuxinclude_HEADERS += ../webp/mux.h +libwebpmuxinclude_HEADERS += ../webp/types.h + libwebpmux_la_LDFLAGS = -version-info 0:0:0 -libwebpmuxinclude_HEADERS = ../webp/mux.h ../webp/types.h libwebpmuxincludedir = $(includedir)/webp diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 368d90ad..92649b0f 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -1,15 +1,26 @@ AM_CPPFLAGS = -I$(top_srcdir)/src +noinst_LTLIBRARIES = libwebputils.la + +libwebputils_la_SOURCES = +libwebputils_la_SOURCES += alpha.c +libwebputils_la_SOURCES += alpha.h +libwebputils_la_SOURCES += bit_reader.c +libwebputils_la_SOURCES += bit_reader.h +libwebputils_la_SOURCES += bit_writer.c +libwebputils_la_SOURCES += bit_writer.h +libwebputils_la_SOURCES += color_cache.c +libwebputils_la_SOURCES += color_cache.h +libwebputils_la_SOURCES += filters.c +libwebputils_la_SOURCES += filters.h +libwebputils_la_SOURCES += huffman.c +libwebputils_la_SOURCES += huffman.h +libwebputils_la_SOURCES += quant_levels.c +libwebputils_la_SOURCES += rescaler.c +libwebputils_la_SOURCES += tcoder.c +libwebputils_la_SOURCES += tcoder.h +libwebputils_la_SOURCES += tcoderi.h +libwebputils_la_SOURCES += thread.c +libwebputils_la_SOURCES += thread.h -libwebputils_la_SOURCES = alpha.h alpha.c \ - bit_reader.h bit_reader.c \ - bit_writer.h bit_writer.c \ - color_cache.h color_cache.c \ - filters.h filters.c \ - huffman.h huffman.c \ - quant_levels.c rescaler.c \ - tcoder.h tcoderi.h tcoder.c \ - thread.h thread.c libwebputilsinclude_HEADERS = ../webp/types.h libwebputilsincludedir = $(includedir)/webp - -noinst_LTLIBRARIES = libwebputils.la