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 changes I33e8a613,I8e8a7b44 into 0.3.0

Browse Source 
* changes:
  automake: add reference to libwebp for mux/demux
  libwebp{,decoder}.pc: add pthread flags
This commit is contained in:
James Zern 2013-03-13 13:17:24 -07:00 committed by Gerrit Code Review
commit 5e338e0b9a
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -1,4 +1,6 @@
SUBDIRS = dec enc dsp utils
# The mux and demux libraries depend on libwebp, thus the '.' to force the
# build order so it's available to them.
SUBDIRS = dec enc dsp utils .
if WANT_MUX
SUBDIRS += mux
endif

3
src/demux/Makefile.am
View File

@ -8,6 +8,7 @@ libwebpdemuxinclude_HEADERS =
libwebpdemuxinclude_HEADERS += ../webp/demux.h
libwebpdemuxinclude_HEADERS += ../webp/types.h
libwebpdemux_la_LDFLAGS = -version-info 0:0:0
libwebpdemux_la_LIBADD = ../libwebp.la
libwebpdemux_la_LDFLAGS = -no-undefined -version-info 0:0:0
libwebpdemuxincludedir = $(includedir)/webp
pkgconfig_DATA = libwebpdemux.pc

2
src/libwebp.pc.in
View File

@ -8,4 +8,4 @@ Description: Library for the WebP graphics format
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lwebp
Libs.private: -lm
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

2
src/libwebpdecoder.pc.in
View File

@ -8,4 +8,4 @@ Description: Library for the WebP graphics format (decode only)
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lwebpdecoder
Libs.private: -lm
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

3
src/mux/Makefile.am
View File

@ -11,6 +11,7 @@ libwebpmuxinclude_HEADERS =
libwebpmuxinclude_HEADERS += ../webp/mux.h
libwebpmuxinclude_HEADERS += ../webp/types.h
libwebpmux_la_LDFLAGS = -version-info 0:0:0
libwebpmux_la_LIBADD = ../libwebp.la
libwebpmux_la_LDFLAGS = -no-undefined -version-info 0:0:0
libwebpmuxincludedir = $(includedir)/webp
pkgconfig_DATA = libwebpmux.pc