From 1bc55fab42a2fe20c7bceb0a83bff46dbe4b4513 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 20 Dec 2010 04:16:34 +0100 Subject: [PATCH] Explicitly link against required libraries. This breaks on some newer systems which enable --as-needed by default. Signed-off-by: Love Hornquist Astrand --- appl/gssmask/Makefile.am | 3 +-- appl/otp/Makefile.am | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/appl/gssmask/Makefile.am b/appl/gssmask/Makefile.am index 63b740fa4..c78f6a67d 100644 --- a/appl/gssmask/Makefile.am +++ b/appl/gssmask/Makefile.am @@ -8,5 +8,4 @@ gssmask_SOURCES = gssmask.c common.c common.h protocol.h gssmaestro_SOURCES = gssmaestro.c common.c common.h protocol.h -LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LIB_roken) - +LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LIB_roken) $(top_builddir)/lib/krb5/libkrb5.la diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am index e5d7246d9..9c8a64d4b 100644 --- a/appl/otp/Makefile.am +++ b/appl/otp/Makefile.am @@ -7,12 +7,11 @@ AM_CPPFLAGS += $(INCLUDE_hcrypto) bin_PROGRAMS = otp otpprint bin_SUIDS = otp otp_SOURCES = otp.c otp_locl.h +otp_LDADD = $(LIB_hcrypto) $(LIB_roken) $(top_builddir)/lib/otp/libotp.la otpprint_SOURCES = otpprint.c otp_locl.h +otpprint_LDADD = $(LIB_hcrypto) $(LIB_roken) $(top_builddir)/lib/otp/libotp.la + man_MANS = otp.1 otpprint.1 -LDADD = \ - $(top_builddir)/lib/otp/libotp.la \ - $(LIB_roken) - EXTRA_DIST = $(man_MANS)