Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 582c86e6 authored by Tracey Dent's avatar Tracey Dent Committed by Sage Weil
Browse files

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: default avatarTracey Dent <tdent48227@gmail.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent dc69e2e9

fs/ceph/Makefile

+1 −22
Original line number Diff line number Diff line
@@ -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