mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
gpg: Move NETLIBS after GPG_ERROR_LIBS.
* g10/Makefile.am (LDADD): Remove NETLIBS. (gpg_LDADD, gpgv_LDADD): Add NETLIBS after GPG_ERROR_LIBS. (gpgcompose_LDADD, t_keydb_get_keyblock_LDADD): Likewise. (t_stutter_LDADD): Likewise. -- GnuPG-bug-id: 6244 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
6f0066db2c
commit
b26bb03ed9
@ -180,18 +180,18 @@ gpgv_SOURCES = gpgv.c \
|
|||||||
# $(common_source)
|
# $(common_source)
|
||||||
|
|
||||||
LDADD = $(needed_libs) ../common/libgpgrl.a \
|
LDADD = $(needed_libs) ../common/libgpgrl.a \
|
||||||
$(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
|
$(ZLIBS) $(LIBINTL) $(CAPLIBS)
|
||||||
gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \
|
gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \
|
||||||
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
|
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||||
$(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
|
$(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
|
||||||
gpg_LDFLAGS = $(extra_bin_ldflags)
|
gpg_LDFLAGS = $(extra_bin_ldflags)
|
||||||
gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
|
gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
|
||||||
$(GPG_ERROR_LIBS) \
|
$(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||||
$(LIBICONV) $(gpgv_robjs) $(extra_sys_libs)
|
$(LIBICONV) $(gpgv_robjs) $(extra_sys_libs)
|
||||||
gpgv_LDFLAGS = $(extra_bin_ldflags)
|
gpgv_LDFLAGS = $(extra_bin_ldflags)
|
||||||
|
|
||||||
gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
|
gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
|
||||||
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
|
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||||
$(LIBICONV) $(extra_sys_libs)
|
$(LIBICONV) $(extra_sys_libs)
|
||||||
gpgcompose_LDFLAGS = $(extra_bin_ldflags)
|
gpgcompose_LDFLAGS = $(extra_bin_ldflags)
|
||||||
|
|
||||||
@ -205,10 +205,10 @@ t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
|||||||
t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \
|
t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \
|
||||||
$(common_source)
|
$(common_source)
|
||||||
t_keydb_get_keyblock_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
t_keydb_get_keyblock_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||||
$(LIBICONV) $(t_common_ldadd)
|
$(NETLIBS) $(LIBICONV) $(t_common_ldadd)
|
||||||
t_stutter_SOURCES = t-stutter.c test-stubs.c \
|
t_stutter_SOURCES = t-stutter.c test-stubs.c \
|
||||||
$(common_source)
|
$(common_source)
|
||||||
t_stutter_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
t_stutter_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||||
$(LIBICONV) $(t_common_ldadd)
|
$(LIBICONV) $(t_common_ldadd)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user