[libxslt] Remove redundant flags from pkg-config files



commit da2f90ba4bc438e39304666b170c3e199b281bb2
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Sun Jun 6 11:30:06 2021 +0200

    Remove redundant flags from pkg-config files
    
    Flags for dependencies are automatically pulled in by "Requires".
    There's no need to list them separately.
    
    Add libxslt as requirement of libexslt.
    
    Fixes #53.

 CMakeLists.txt | 1 -
 configure.ac   | 2 --
 libexslt.pc.in | 4 ++--
 libxslt.pc.in  | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e3a7303..d93f26d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -475,7 +475,6 @@ set(XSLT_PRIVATE_LIBS "${M_LIBS}")
 
 set(EXSLT_INCLUDEDIR "-I\${includedir}")
 set(EXSLT_LIBDIR "-L\${libdir}")
-set(EXSLT_LIBS "-lexslt ${XSLT_LIBS}")
 set(EXSLT_PRIVATE_LIBS "${XSLT_PRIVATE_LIBS} ${LIBGCRYPT_LIBS}")
 
 file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
diff --git a/configure.ac b/configure.ac
index 172423ad..9a514c6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,11 +687,9 @@ AC_SUBST(XSLT_PRIVATE_LIBS)
 
 EXSLT_LIBDIR='-L${libdir}'
 EXSLT_INCLUDEDIR='-I${includedir}'
-EXSLT_LIBS="-lexslt $XSLT_LIBS"
 EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS"
 AC_SUBST(EXSLT_LIBDIR)
 AC_SUBST(EXSLT_INCLUDEDIR)
-AC_SUBST(EXSLT_LIBS)
 AC_SUBST(EXSLT_PRIVATE_LIBS)
 
 AC_SUBST(EXTRA_LIBS)
diff --git a/libexslt.pc.in b/libexslt.pc.in
index c0e954f0..1d605639 100644
--- a/libexslt.pc.in
+++ b/libexslt.pc.in
@@ -7,7 +7,7 @@ includedir=@includedir@
 Name: libexslt
 Version: @LIBEXSLT_VERSION@
 Description: EXSLT Extension library
-Requires: libxml-2.0
+Requires: libxml-2.0, libxslt
 Cflags: @EXSLT_INCLUDEDIR@
-Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
+Libs: @EXSLT_LIBDIR@ -lexslt
 Libs.private: @EXSLT_PRIVATE_LIBS@
diff --git a/libxslt.pc.in b/libxslt.pc.in
index 81f8be12..5a73c516 100644
--- a/libxslt.pc.in
+++ b/libxslt.pc.in
@@ -9,5 +9,5 @@ Version: @VERSION@
 Description: XSLT library version 2.
 Requires: libxml-2.0
 Cflags: @XSLT_INCLUDEDIR@
-Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
+Libs: @XSLT_LIBDIR@ -lxslt
 Libs.private: @XSLT_PRIVATE_LIBS@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]