summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Fernandes <josferna@redhat.com>2015-03-23 19:49:19 +0530
committerNiels de Vos <ndevos@redhat.com>2015-03-25 06:23:10 -0700
commit00863dde3984030674d946de9fe94d5c07334c5e (patch)
tree984728bf0b60ad761b87f0bafdfcdd432789fa81
parent1579d633dbeeeede20d016bbec806a00688e32f3 (diff)
Fixing build of xlator/cluster/dht/src/dht-rebalance.c when tiering is disabled
1) Removed unnecessary include tier.h in dht-rebalance.c 2) tier xlator will only compile when tiering is enabled in configure.ac Change-Id: Ia21aa9ff403506dc898a83236e9e2d382a0594da BUG: 1204604 Signed-off-by: Joseph Fernandes <josferna@redhat.com> Reviewed-on: http://review.gluster.org/9973 Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Sachin Pandit <spandit@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/cluster/dht/src/Makefile.am11
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c1
2 files changed, 8 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
index 2107881d19f..bbe5cdd8d83 100644
--- a/xlators/cluster/dht/src/Makefile.am
+++ b/xlators/cluster/dht/src/Makefile.am
@@ -1,4 +1,10 @@
-xlator_LTLIBRARIES = dht.la nufa.la switch.la tier.la
+xlator_LTLIBRARIES = dht.la nufa.la switch.la
+if BUILD_GFDB
+ xlator_LTLIBRARIES += tier.la
+endif
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
dht_common_source = dht-layout.c dht-helper.c dht-linkfile.c dht-rebalance.c \
@@ -21,6 +27,7 @@ nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
switch_la_LDFLAGS = -module -avoid-version
switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+tier_la_CFLAGS = $(AM_CFLAGS) $(SQLITE_CFLAGS)
tier_la_LDFLAGS = -module -avoid-version
tier_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\
$(top_builddir)/libglusterfs/src/gfdb/libgfdb.la
@@ -32,8 +39,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
-I$(top_srcdir)/libglusterfs/src/gfdb \
-I$(top_srcdir)/xlators/lib/src
-AM_CFLAGS = -Wall $(GF_CFLAGS) $(SQLITE_CFLAGS)
-
CLEANFILES =
uninstall-local:
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index b838ecec4b7..fc3b6124dd5 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -19,7 +19,6 @@
#include <signal.h>
#include <fnmatch.h>
#include <signal.h>
-#include "tier.h"
#define GF_DISK_SECTOR_SIZE 512
#define DHT_REBALANCE_PID 4242 /* Change it if required */