X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fbtrfs%2FMakefile;h=d2cf5a54a4b816d308ed7c452892fae27e009db1;hb=5a7be515b1f4569aac601170fc681741434cca92;hp=1a0fb74223932cb106b6af186e1720645bb1d326;hpb=e20d96d64f9cf9288ffecc9ad4714e91c3b97ca8;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 1a0fb74..d2cf5a5 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -1,21 +1,25 @@
 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 \
-	   hash.o file-item.o inode-item.o inode-map.o disk-io.o
-
-#btrfs-y := ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
-#	  root-tree.o dir-item.o hash.o file-item.o inode-item.o \
-#	  inode-map.o \
-
+	   file-item.o inode-item.o inode-map.o disk-io.o \
+	   transaction.o inode.o file.o tree-defrag.o \
+	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
+	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
+	   ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \
+	   compression.o
 else
 
 # Normal Makefile
 
 KERNELDIR := /lib/modules/`uname -r`/build
-all::
-	$(MAKE) C=1 -C $(KERNELDIR) M=`pwd` modules
-clean::
-	rm *.o btrfs.ko
+all:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` CONFIG_BTRFS_FS=m modules
+
+modules_install:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install
+clean:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` clean
+
 endif