summaryrefslogtreecommitdiffstats
path: root/heal/src
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-04-29 21:03:39 +0200
committerNiels de Vos <ndevos@redhat.com>2015-04-29 23:26:14 -0700
commit0d3759fa8b4c0ba1c2d747ab96b9fd2442488635 (patch)
tree45ba3f5d60b90142b49450726798b42c1f53d800 /heal/src
parentdc089a1a51988c2b407040e1684d7b0adbd79556 (diff)
build: glfsheal should link against $(UUID_LIBS)
Without this, building fails on Debian Jessie: /usr/bin/ld: glfs-heal.o: undefined reference to symbol 'uuid_clear@@UUID_1.0' /lib/x86_64-linux-gnu/libuuid.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Makefile:503: recipe for target 'glfsheal' failed While at it, clean some of the unused defines too. BUG: 1206587 Change-Id: I2e513b2a806e6241542e60007d720cca16dabb06 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/10453 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'heal/src')
-rw-r--r--heal/src/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/heal/src/Makefile.am b/heal/src/Makefile.am
index acde4b1..512e9e6 100644
--- a/heal/src/Makefile.am
+++ b/heal/src/Makefile.am
@@ -6,7 +6,7 @@ glfsheal_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\
$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
$(top_builddir)/api/src/libgfapi.la \
- $(GF_GLUSTERFS_LIBS) $(XML_LIBS) $(GFAPI_LIBS)
+ $(XML_LIBS) $(GFAPI_LIBS) $(UUID_LIBS)
glfsheal_LDFLAGS = $(GF_LDFLAGS)
@@ -17,9 +17,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \
-I$(top_srcdir)/api/src\
-I$(top_srcdir)/contrib/argp-standalone\
-DDATADIR=\"$(localstatedir)\" \
- -DCONFDIR=\"$(sysconfdir)/glusterfs\" \
- -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
- -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\
+ -DSBIN_DIR=\"$(sbindir)\" \
$(XML_CPPFLAGS)
AM_CFLAGS = -Wall $(GF_CFLAGS)