diff options
| author | Tracey Dent <tdent48227@gmail.com> | 2010-12-14 19:32:37 -0500 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-01-12 15:15:13 -0800 |
| commit | 582c86e69045f37da8be445c265f72a7a73b18c6 (patch) | |
| tree | 4c6661ffd8b5b331ce6f1316e9556c1bda079dfb | |
| parent | dc69e2e9fcd7c613eb744ea3b9c4ee9ca554e822 (diff) | |
| download | linux-582c86e69045f37da8be445c265f72a7a73b18c6.tar.gz linux-582c86e69045f37da8be445c265f72a7a73b18c6.tar.bz2 linux-582c86e69045f37da8be445c265f72a7a73b18c6.zip | |
ceph: Makefile: Remove unnessary code
Remove the if and else conditional because the code is in mainline and there
is no need in it being there.
Also, Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/Makefile | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/fs/ceph/Makefile b/fs/ceph/Makefile index 9e6c4f2e8ff1..bd352125e829 100644 --- a/fs/ceph/Makefile +++ b/fs/ceph/Makefile @@ -2,31 +2,10 @@ # Makefile for CEPH filesystem. # -ifneq ($(KERNELRELEASE),) - obj-$(CONFIG_CEPH_FS) += ceph.o -ceph-objs := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ +ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ export.o caps.o snap.o xattr.o \ mds_client.o mdsmap.o strings.o ceph_frag.o \ debugfs.o -else -#Otherwise we were called directly from the command -# line; invoke the kernel build system. - -KERNELDIR ?= /lib/modules/$(shell uname -r)/build -PWD := $(shell pwd) - -default: all - -all: - $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules - -modules_install: - $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules_install - -clean: - $(MAKE) -C $(KERNELDIR) M=$(PWD) clean - -endif |