dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-16 05:49:51 +02: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
parent 70809d89bb 9048494df6
commit 5621934e82
3 changed files with 15 additions and 21 deletions
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