dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-31 10:25:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

*.pc.in: rename lib_prefix to webp_libname_prefix

Browse Source 
this will help avoid any future conflicts with the more generic autoconf
type name

Change-Id: I0311e03a11a541118025c7dbe8309365f6efa847
This commit is contained in:
James Zern
2022-10-24 16:44:42 -07:00
parent c42e6d5a89
commit 28aedcb9b0
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -134,10 +134,10 @@ set(INSTALLED_LIBRARIES)
if(MSVC) if(MSVC)
# match the naming convention used by nmake # match the naming convention used by nmake
set(lib_prefix "lib") set(webp_libname_prefix "lib")
set(CMAKE_SHARED_LIBRARY_PREFIX "${lib_prefix}") set(CMAKE_SHARED_LIBRARY_PREFIX "${webp_libname_prefix}")
set(CMAKE_IMPORT_LIBRARY_PREFIX "${lib_prefix}") set(CMAKE_IMPORT_LIBRARY_PREFIX "${webp_libname_prefix}")
set(CMAKE_STATIC_LIBRARY_PREFIX "${lib_prefix}") set(CMAKE_STATIC_LIBRARY_PREFIX "${webp_libname_prefix}")
endif() endif()
set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_C_VISIBILITY_PRESET hidden)

4
configure.ac
View File

@@ -749,8 +749,8 @@ fi
dnl ========================= dnl =========================
dnl Add an empty lib_prefix variable for use in *.pc.in. dnl Add an empty webp_libname_prefix variable for use in *.pc.in.
AC_SUBST([lib_prefix]) AC_SUBST([webp_libname_prefix])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/webp/config.h]) AC_CONFIG_HEADERS([src/webp/config.h])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \

2
sharpyuv/libsharpyuv.pc.in
View File

@@ -7,5 +7,5 @@ Name: libsharpyuv
Description: Library for sharp RGB to YUV conversion Description: Library for sharp RGB to YUV conversion
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@sharpyuv Libs: -L${libdir} -l@webp_libname_prefix@sharpyuv
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

2
src/demux/libwebpdemux.pc.in
View File

@@ -8,4 +8,4 @@ Description: Library for parsing the WebP graphics format container
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: libwebp >= 0.2.0 Requires: libwebp >= 0.2.0
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webpdemux Libs: -L${libdir} -l@webp_libname_prefix@webpdemux

2
src/libwebp.pc.in
View File

@@ -8,5 +8,5 @@ Description: Library for the WebP graphics format
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: libsharpyuv Requires: libsharpyuv
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webp Libs: -L${libdir} -l@webp_libname_prefix@webp
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

2
src/libwebpdecoder.pc.in
View File

@@ -7,5 +7,5 @@ Name: libwebpdecoder
Description: Library for the WebP graphics format (decode only) Description: Library for the WebP graphics format (decode only)
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webpdecoder Libs: -L${libdir} -l@webp_libname_prefix@webpdecoder
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

2
src/mux/libwebpmux.pc.in
View File

@@ -8,5 +8,5 @@ Description: Library for manipulating the WebP graphics format container
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: libwebp >= 0.2.0 Requires: libwebp >= 0.2.0
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webpmux Libs: -L${libdir} -l@webp_libname_prefix@webpmux
Libs.private: -lm Libs.private: -lm