diff options
| author | Sage Weil <sage@newdream.net> | 2008-10-09 11:52:35 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-10-09 11:52:35 -0400 |
| commit | 61f8c86ee8f9ca55488449db886104a0ab4e1f98 (patch) | |
| tree | 189a94887dedae9e854aa53228ab10740a01a5f2 | |
| parent | 5b84e8d6eef82fcf7b1b16d92e29375b85b6549a (diff) | |
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>
| -rw-r--r-- | fs/btrfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 48b7909ca8d..7125716e142 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ifneq ($(KERNELRELEASE),) | 1 | ifneq ($(KERNELRELEASE),) |
| 2 | # kbuild part of makefile | 2 | # kbuild part of makefile |
| 3 | 3 | ||
| 4 | obj-m := btrfs.o | 4 | obj-$(CONFIG_BTRFS_FS) := btrfs.o |
| 5 | btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ | 5 | btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ |
| 6 | file-item.o inode-item.o inode-map.o disk-io.o \ | 6 | file-item.o inode-item.o inode-map.o disk-io.o \ |
| 7 | transaction.o inode.o file.o tree-defrag.o \ | 7 | transaction.o inode.o file.o tree-defrag.o \ |
| @@ -14,7 +14,7 @@ else | |||
| 14 | 14 | ||
| 15 | KERNELDIR := /lib/modules/`uname -r`/build | 15 | KERNELDIR := /lib/modules/`uname -r`/build |
| 16 | all: | 16 | all: |
| 17 | $(MAKE) -C $(KERNELDIR) M=`pwd` modules | 17 | $(MAKE) -C $(KERNELDIR) M=`pwd` CONFIG_BTRFS_FS=m modules |
| 18 | 18 | ||
| 19 | modules_install: | 19 | modules_install: |
| 20 | $(MAKE) -C $(KERNELDIR) M=`pwd` modules_install | 20 | $(MAKE) -C $(KERNELDIR) M=`pwd` modules_install |