From: Sage Weil <sage@newdream.net>
Date: Thu, 9 Oct 2008 15:52:35 +0000 (-0400)
Subject: Btrfs: Fix makefile for builing btrfs static
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=61f8c86ee8f9ca55488449db886104a0ab4e1f98;p=deliverable%2Flinux.git

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>
---

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 48b7909ca8d1..7125716e142b 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