diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2020-02-25 16:31:10 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2020-02-25 16:31:10 +0900 |
| commit | 034e5450cdd5d886d9f333ef3872d4263b435dbb (patch) | |
| tree | 8f64967c7ff20067ebd8e4e6e606a9841188d227 | |
| parent | 16d3ffa15906037863110f4157ab84e13f579752 (diff) | |
| download | libassuan-034e5450cdd5d886d9f333ef3872d4263b435dbb.tar.gz | |
build: Use Requires.private and Libs.private.
* configure.ac (LIBASSUAN_CONFIG_LIBS): Remove NETLIBS.
* src/libassuan.pc.in: Distinguish static link.
* tests/Makefile.am: Don't need to link NETLIBS.
GnuPG-bug-id: 4624
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/libassuan.pc.in | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 82648ee..ced32e4 100644 --- a/configure.ac +++ b/configure.ac @@ -328,9 +328,6 @@ fi LIBASSUAN_CONFIG_LIBS="-lassuan" LIBASSUAN_CONFIG_CFLAGS="" LIBASSUAN_CONFIG_HOST="$host" -if test x"$NETLIBS" != x; then - LIBASSUAN_CONFIG_LIBS="$LIBASSUAN_CONFIG_LIBS $NETLIBS" -fi AC_SUBST(LIBASSUAN_CONFIG_LIBS) AC_SUBST(LIBASSUAN_CONFIG_CFLAGS) AC_SUBST(LIBASSUAN_CONFIG_HOST) diff --git a/src/libassuan.pc.in b/src/libassuan.pc.in index 7721f6c..c622d4b 100644 --- a/src/libassuan.pc.in +++ b/src/libassuan.pc.in @@ -7,8 +7,9 @@ api_version=@LIBASSUAN_CONFIG_API_VERSION@ Name: libassuan Description: IPC library for the GnuPG components -Requires: gpg-error +Requires.private: gpg-error Version: @PACKAGE_VERSION@ Cflags: -I${includedir} @LIBASSUAN_CONFIG_CFLAGS@ Libs: -L${libdir} @LIBASSUAN_CONFIG_LIBS@ +Libs.private: @NETLIBS@ URL: https://www.gnupg.org/related_software/libassuan/index.html diff --git a/tests/Makefile.am b/tests/Makefile.am index 85c2d82..b547d37 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,6 +47,5 @@ AM_LDFLAGS = -no-install noinst_HEADERS = common.h noinst_PROGRAMS = $(TESTS) $(w32cetools) $(testtools) -LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) \ +LDADD = ../src/libassuan.la $(GPG_ERROR_LIBS) \ @LDADD_FOR_TESTS_KLUDGE@ - |