[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH] gfs2-utils: Only build group/ when gfs_controld is enabled



The previous commit only disabled gfs_controld from building when
--enable-gfs_controld was omitted. When we're not building gfs_controld
there really is no reason to build anything else in the group/ directory
so this patch disables it by default.

Signed-off-by: Andrew Price <anprice redhat com>
---
 Makefile.am       |    6 +++++-
 group/Makefile.am |    6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2e5d9ae..0af3e04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,11 @@ noinst_HEADERS		= make/copyright.cf
 
 ACLOCAL_AMFLAGS		= -I m4
 
-SUBDIRS			= po group gfs2 doc
+if BUILD_GFS_CONTROLD
+DIR_GROUP		= group
+endif
+
+SUBDIRS			= po $(DIR_GROUP) gfs2 doc
 
 install-exec-local:
 			$(INSTALL) -d $(DESTDIR)/$(LOGDIR)
diff --git a/group/Makefile.am b/group/Makefile.am
index 2904ce1..5b7d0f8 100644
--- a/group/Makefile.am
+++ b/group/Makefile.am
@@ -1,7 +1,3 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-if BUILD_GFS_CONTROLD
-DIR_GFS_CONTROLD	= gfs_controld
-endif
-
-SUBDIRS			= libgfscontrol gfs_control $(DIR_GFS_CONTROLD) man include
+SUBDIRS			= libgfscontrol gfs_control gfs_controld man include
-- 
1.7.10.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]