From 57c61d70ec1920f731f9509510e6913aa1d62aa3 Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Fri, 18 Jul 2014 09:24:38 +0200 Subject: build: add libraries to LIBADD instead of LDFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For a number of linker flags the order of the object files and the libs to link against matter (for example -Wl,--as-needed). Make sure that libraries are added via the LIBADD variable instead of LDFLAGS and therefore always come after the object files. Change-Id: I59d114752a0c7664b8678a72082ba5e445497fe5 Signed-off-by: Tiziano Müller Reviewed-on: http://review.gluster.org/8331 Reviewed-by: Harshavardhana Reviewed-by: Prashanth Pai Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/encryption/crypt/src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/encryption/crypt/src') diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am index b13f65043d3..d7ebac61884 100644 --- a/xlators/encryption/crypt/src/Makefile.am +++ b/xlators/encryption/crypt/src/Makefile.am @@ -3,10 +3,10 @@ if ENABLE_CRYPT_XLATOR xlator_LTLIBRARIES = crypt.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption -crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto +crypt_la_LDFLAGS = -module -avoid-version crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c -crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h @@ -21,4 +21,4 @@ else noinst_DIST = keys.c data.c metadata.c atom.c crypt.c noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h -endif \ No newline at end of file +endif -- cgit