summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/Makefile
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2008-10-09 11:52:35 -0400
committerChris Mason <chris.mason@oracle.com>2008-10-09 11:52:35 -0400
commit61f8c86ee8f9ca55488449db886104a0ab4e1f98 (patch)
tree189a94887dedae9e854aa53228ab10740a01a5f2 /fs/btrfs/Makefile
parent5b84e8d6eef82fcf7b1b16d92e29375b85b6549a (diff)
downloadop-kernel-dev-61f8c86ee8f9ca55488449db886104a0ab4e1f98.zip
op-kernel-dev-61f8c86ee8f9ca55488449db886104a0ab4e1f98.tar.gz
Btrfs: Fix makefile for builing btrfs static
This fixes the btrfs makefile for building in the tree and out of the tree both as a module and static. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/Makefile')
-rw-r--r--fs/btrfs/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 48b7909..7125716 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -1,7 +1,7 @@
ifneq ($(KERNELRELEASE),)
# kbuild part of makefile
-obj-m := btrfs.o
+obj-$(CONFIG_BTRFS_FS) := btrfs.o
btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
file-item.o inode-item.o inode-map.o disk-io.o \
transaction.o inode.o file.o tree-defrag.o \
@@ -14,7 +14,7 @@ else
KERNELDIR := /lib/modules/`uname -r`/build
all:
- $(MAKE) -C $(KERNELDIR) M=`pwd` modules
+ $(MAKE) -C $(KERNELDIR) M=`pwd` CONFIG_BTRFS_FS=m modules
modules_install:
$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install
OpenPOWER on IntegriCloud