dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "build: fix install race on shared headers" into 0.3.0

Browse Source
This commit is contained in:
pascal massimino 2013-03-17 02:38:16 -07:00 committed by Gerrit Code Review
commit 5621934e82
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile.am
View File

@ -15,11 +15,14 @@ if BUILD_LIBWEBPDECODER
lib_LTLIBRARIES += libwebpdecoder.la
endif
common_HEADERS =
common_HEADERS += webp/decode.h
common_HEADERS += webp/types.h
commondir = $(includedir)/webp
libwebp_la_SOURCES =
libwebpinclude_HEADERS =
libwebpinclude_HEADERS += webp/decode.h
libwebpinclude_HEADERS += webp/encode.h
libwebpinclude_HEADERS += webp/types.h
noinst_HEADERS =
noinst_HEADERS += webp/format_constants.h
@ -39,9 +42,6 @@ pkgconfig_DATA = libwebp.pc
if BUILD_LIBWEBPDECODER
libwebpdecoder_la_SOURCES =
libwebpdecoderinclude_HEADERS =
libwebpdecoderinclude_HEADERS += webp/decode.h
libwebpdecoderinclude_HEADERS += webp/types.h
libwebpdecoder_la_LIBADD =
libwebpdecoder_la_LIBADD += dec/libwebpdecode.la
@ -49,7 +49,6 @@ if BUILD_LIBWEBPDECODER
libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.la
libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 0:0:0
libwebpdecoderincludedir = $(includedir)/webp
pkgconfig_DATA += libwebpdecoder.pc
endif

11
src/dsp/Makefile.am
View File

@ -5,7 +5,10 @@ if BUILD_LIBWEBPDECODER
noinst_LTLIBRARIES += libwebpdspdecode.la
endif
COMMON_SOURCES =
common_HEADERS = ../webp/types.h
commondir = $(includedir)/webp
COMMON_SOURCES =
COMMON_SOURCES += cpu.c
COMMON_SOURCES += dec.c
COMMON_SOURCES += dec_neon.c
@ -19,13 +22,12 @@ COMMON_SOURCES += upsampling_sse2.c
COMMON_SOURCES += yuv.c
COMMON_SOURCES += yuv.h
ENC_SOURCES =
ENC_SOURCES =
ENC_SOURCES += enc.c
ENC_SOURCES += enc_neon.c
ENC_SOURCES += enc_sse2.c
libwebpdsp_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES)
libwebpdspinclude_HEADERS = ../webp/types.h
noinst_HEADERS =
noinst_HEADERS += ../dec/decode_vp8.h
@ -33,13 +35,10 @@ noinst_HEADERS += ../webp/decode.h
libwebpdsp_la_LDFLAGS = -lm
libwebpdsp_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE) $(USE_SWAP_16BIT_CSP)
libwebpdspincludedir = $(includedir)/webp
if BUILD_LIBWEBPDECODER
libwebpdspdecode_la_SOURCES = $(COMMON_SOURCES)
libwebpdspdecodeinclude_HEADERS = $(libwebpdspinclude_HEADERS)
libwebpdspdecode_la_LDFLAGS = $(libwebpdsp_la_LDFLAGS)
libwebpdspdecode_la_CPPFLAGS = $(libwebpdsp_la_CPPFLAGS)
libwebpdspdecodeincludedir = $(libwebpdspincludedir)
endif

14
src/utils/Makefile.am
View File

@ -5,7 +5,10 @@ if BUILD_LIBWEBPDECODER
noinst_LTLIBRARIES += libwebputilsdecode.la
endif
COMMON_SOURCES =
common_HEADERS = ../webp/types.h
commondir = $(includedir)/webp
COMMON_SOURCES =
COMMON_SOURCES += bit_reader.c
COMMON_SOURCES += bit_reader.h
COMMON_SOURCES += color_cache.c
@ -23,7 +26,7 @@ COMMON_SOURCES += thread.h
COMMON_SOURCES += utils.c
COMMON_SOURCES += utils.h
ENC_SOURCES =
ENC_SOURCES =
ENC_SOURCES += bit_writer.c
ENC_SOURCES += bit_writer.h
ENC_SOURCES += huffman_encode.c
@ -31,15 +34,8 @@ ENC_SOURCES += huffman_encode.h
ENC_SOURCES += quant_levels.c
ENC_SOURCES += quant_levels.h
libwebputils_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES)
libwebputilsinclude_HEADERS = ../webp/types.h
libwebputilsincludedir = $(includedir)/webp
if BUILD_LIBWEBPDECODER
libwebputilsdecode_la_SOURCES = $(COMMON_SOURCES)
libwebputilsdecodeinclude_HEADERS = $(libwebputilsinclude_HEADERS)
libwebputilsdecodeincludedir = $(libwebputilsincludedir)
endif