cluster: STABLE3 - build: fix Makefile filters for gfs

Fabio M. Di Nitto fabbione at fedoraproject.org
Fri Jan 8 09:27:34 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=33dd41fa03a5a79a585630cfeae57489729faa6c
Commit:        33dd41fa03a5a79a585630cfeae57489729faa6c
Parent:        585af66d237cb3408c469351a3f69c78a6c4ad1c
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Fri Jan 8 10:23:38 2010 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Jan 8 10:23:38 2010 +0100

build: fix Makefile filters for gfs

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 Makefile |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 223c75d..3e3cab9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,19 +16,14 @@ SUBDIRS = $(filter-out \
 	  $(if ${without_gfs2},gfs2) \
 	  $(if ${without_rgmanager},rgmanager) \
 	  $(if ${without_bindings},bindings) \
+	  $(if ${enable_gfs},,gfs) \
+	  $(if ${enable_gfs-kernel/src/gfs},,gfs-kernel/src/gfs) \
 	  , $(REALSUBDIRS))
 
-ifdef enable_gfs
-SUBDIRS += gfs
-endif
-ifdef enable_gfs-kernel/src/gfs
-SUBDIRS += gfs-kernel/src/gfs
-endif
-
 all: ${SUBDIRS}
 
 ${SUBDIRS}:
-	[ -n "${without_$@}" ] || ${MAKE} -C $@ all
+	${MAKE} -C $@ all
 
 # Kernel
 


More information about the cluster-commits mailing list