From: Andrew Price <anprice@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH] gfs2-utils: Only build group/ when gfs_controld is enabled
Date: Wed, 4 Jul 2012 12:43:10 +0100 [thread overview]
Message-ID: <1341402190-22695-1-git-send-email-anprice@redhat.com> (raw)
In-Reply-To: <4FF4230B.5080503@redhat.com>
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
next prev parent reply other threads:[~2012-07-04 11:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-03 18:00 [Cluster-devel] [PATCH] gfs2-utils: Make building gfs2_controld optional Andrew Price
2012-07-04 9:51 ` Steven Whitehouse
2012-07-04 11:03 ` Fabio M. Di Nitto
2012-07-04 11:43 ` Andrew Price [this message]
2012-07-04 11:48 ` [Cluster-devel] [PATCH] gfs2-utils: Only build group/ when gfs_controld is enabled Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341402190-22695-1-git-send-email-anprice@redhat.com \
--to=anprice@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).