diff options
| author | Tiziano Müller <tiziano.mueller@stepping-stone.ch> | 2014-07-18 09:24:38 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-07-19 14:14:03 -0700 |
| commit | 57c61d70ec1920f731f9509510e6913aa1d62aa3 (patch) | |
| tree | 21f671c9534021e95c9188ef7bbf4091b134709c /xlators | |
| parent | d30c3dcf1137a0a94c0be0d0c57de86aadad2a33 (diff) | |
build: add libraries to LIBADD instead of LDFLAGS
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 <tiziano.mueller@stepping-stone.ch>
Reviewed-on: http://review.gluster.org/8331
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/encryption/crypt/src/Makefile.am | 6 | ||||
| -rw-r--r-- | xlators/features/compress/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 6 |
3 files changed, 8 insertions, 8 deletions
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 diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am index 263b21b783b..e69dc6bf236 100644 --- a/xlators/features/compress/src/Makefile.am +++ b/xlators/features/compress/src/Makefile.am @@ -4,10 +4,10 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features noinst_HEADERS = cdc.h cdc-mem-types.h -cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS) +cdc_la_LDFLAGS = -module -avoid-version cdc_la_SOURCES = cdc.c cdc-helper.c -cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \ -shared $(LIBZ_CFLAGS) diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 7f3e8ddd88f..d8a1e257c4e 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -2,9 +2,6 @@ xlator_LTLIBRARIES = glusterd.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" glusterd_la_LDFLAGS = -module -avoid-version -if ENABLE_BD_XLATOR -glusterd_la_LDFLAGS += -llvm2app -endif glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c \ glusterd-op-sm.c glusterd-utils.c glusterd-rpc-ops.c \ glusterd-store.c glusterd-handshake.c glusterd-pmap.c \ @@ -19,6 +16,9 @@ glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ $(top_builddir)/rpc/xdr/src/libgfxdr.la \ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ $(XML_LIBS) -lcrypto +if ENABLE_BD_XLATOR +glusterd_la_LIBADD += -llvm2app +endif noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ glusterd-sm.h glusterd-store.h glusterd-mem-types.h \ |