Skip to content
Snippets Groups Projects
Commit 23712ecd9dfe authored by Nick Wellnhofer's avatar Nick Wellnhofer
Browse files

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.
parent 562e54724728
No related branches found
No related tags found
No related merge requests found
...@@ -475,7 +475,6 @@ ...@@ -475,7 +475,6 @@
set(EXSLT_INCLUDEDIR "-I\${includedir}") set(EXSLT_INCLUDEDIR "-I\${includedir}")
set(EXSLT_LIBDIR "-L\${libdir}") set(EXSLT_LIBDIR "-L\${libdir}")
set(EXSLT_LIBS "-lexslt ${XSLT_LIBS}")
set(EXSLT_PRIVATE_LIBS "${XSLT_PRIVATE_LIBS} ${LIBGCRYPT_LIBS}") set(EXSLT_PRIVATE_LIBS "${XSLT_PRIVATE_LIBS} ${LIBGCRYPT_LIBS}")
file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}") file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
......
...@@ -687,7 +687,6 @@ ...@@ -687,7 +687,6 @@
EXSLT_LIBDIR='-L${libdir}' EXSLT_LIBDIR='-L${libdir}'
EXSLT_INCLUDEDIR='-I${includedir}' EXSLT_INCLUDEDIR='-I${includedir}'
EXSLT_LIBS="-lexslt $XSLT_LIBS"
EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS" EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS"
AC_SUBST(EXSLT_LIBDIR) AC_SUBST(EXSLT_LIBDIR)
AC_SUBST(EXSLT_INCLUDEDIR) AC_SUBST(EXSLT_INCLUDEDIR)
...@@ -691,7 +690,6 @@ ...@@ -691,7 +690,6 @@
EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS" EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS"
AC_SUBST(EXSLT_LIBDIR) AC_SUBST(EXSLT_LIBDIR)
AC_SUBST(EXSLT_INCLUDEDIR) AC_SUBST(EXSLT_INCLUDEDIR)
AC_SUBST(EXSLT_LIBS)
AC_SUBST(EXSLT_PRIVATE_LIBS) AC_SUBST(EXSLT_PRIVATE_LIBS)
AC_SUBST(EXTRA_LIBS) AC_SUBST(EXTRA_LIBS)
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
Name: libexslt Name: libexslt
Version: @LIBEXSLT_VERSION@ Version: @LIBEXSLT_VERSION@
Description: EXSLT Extension library Description: EXSLT Extension library
Requires: libxml-2.0 Requires: libxml-2.0, libxslt
Cflags: @EXSLT_INCLUDEDIR@ Cflags: @EXSLT_INCLUDEDIR@
...@@ -11,3 +11,3 @@ ...@@ -11,3 +11,3 @@
Cflags: @EXSLT_INCLUDEDIR@ Cflags: @EXSLT_INCLUDEDIR@
Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@ Libs: @EXSLT_LIBDIR@ -lexslt
Libs.private: @EXSLT_PRIVATE_LIBS@ Libs.private: @EXSLT_PRIVATE_LIBS@
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
Description: XSLT library version 2. Description: XSLT library version 2.
Requires: libxml-2.0 Requires: libxml-2.0
Cflags: @XSLT_INCLUDEDIR@ Cflags: @XSLT_INCLUDEDIR@
Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ Libs: @XSLT_LIBDIR@ -lxslt
Libs.private: @XSLT_PRIVATE_LIBS@ Libs.private: @XSLT_PRIVATE_LIBS@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment