ocfs2: Allow selection of cluster plug-ins.

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / Makefile

diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
index b8d6d02257370299f1f81b2db0a86480739cda24..f6956de56fdb8e96b0e592f5ed4b95f98a7d3320 100644 (file)
--- a/fs/ocfs2/Makefile
+++ b/fs/ocfs2/Makefile
@@ -4,9 +4,10 @@ EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
 
 obj-$(CONFIG_OCFS2_FS) +=      \
        ocfs2.o                 \
-       ocfs2_stackglue.o       \
-       ocfs2_stack_o2cb.o      \
-       ocfs2_stack_user.o
+       ocfs2_stackglue.o
+
+obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_stack_o2cb.o
+obj-$(CONFIG_OCFS2_FS_USERSPACE_CLUSTER) += ocfs2_stack_user.o
 
 ocfs2-objs := \
        alloc.o                 \
@@ -39,5 +40,6 @@ ocfs2_stackglue-objs := stackglue.o
 ocfs2_stack_o2cb-objs := stack_o2cb.o
 ocfs2_stack_user-objs := stack_user.o
 
+# cluster/ is always needed when OCFS2_FS for masklog support
 obj-$(CONFIG_OCFS2_FS) += cluster/
-obj-$(CONFIG_OCFS2_FS) += dlm/
+obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/