Skip to content

Commit

Permalink
ceph: Makefile: Remove unnessary code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tracey Dent authored and Sage Weil committed Jan 12, 2011
1 parent dc69e2e commit 582c86e
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions fs/ceph/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 582c86e

Please sign in to comment.