From patchwork Wed Dec 15 00:32:37 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: T Dent <tdent48227@gmail.com>
X-Patchwork-Id: 412001
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBF0WwAR002888
	for <patchwork-ceph-devel@patchwork.kernel.org>;
	Wed, 15 Dec 2010 00:32:59 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753665Ab0LOAc6 (ORCPT
	<rfc822;patchwork-ceph-devel@patchwork.kernel.org>);
	Tue, 14 Dec 2010 19:32:58 -0500
Received: from mail-iw0-f174.google.com ([209.85.214.174]:45179 "EHLO
	mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752542Ab0LOAc5 (ORCPT
	<rfc822; ceph-devel@vger.kernel.org>); Tue, 14 Dec 2010 19:32:57 -0500
Received: by iwn9 with SMTP id 9so1383989iwn.19
	for <ceph-devel@vger.kernel.org>;
	Tue, 14 Dec 2010 16:32:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:date
	:message-id:x-mailer;
	bh=7h0B4hHqJSp2vxiNeEhext6gVImvacDypyPgb9aNZYE=;
	b=hYx0h5bu+M9reKs0ghTsx1se54+/g4pGONGZjV/PQWbcA/7vPhQVpZSxWvluN+Y8SS
	oU+IgLNG5tN+r94UW9QeSL/02qLiDJKKgG4DwnBTa96uqbtKQiK+94RhYJ4Nd4IO/+UF
	1euv/YpLiz1Bb8+zWqry5ghjBj77KHeyb1KAE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer;
	b=AqNY3tAtP9iIIvIPanES9CfqAs16h8FubMS4G29srkxvoCT6YEVpMow+36UH/OGjQF
	9eb/JVyx8cnNQ4P59N5ru3js1Zti0hg9KmFSiEvSyfRhoTZW7SXb8kGZjSD1syEwGx7W
	DKm0OJlQIPpBeGFjhY1qYRlAZuwKZdPoPBdCs=
Received: by 10.42.180.65 with SMTP id bt1mr5221739icb.134.1292373164078;
	Tue, 14 Dec 2010 16:32:44 -0800 (PST)
Received: from localhost.localdomain (c-68-60-162-241.hsd1.mi.comcast.net
	[68.60.162.241])
	by mx.google.com with ESMTPS id 14sm301941ico.8.2010.12.14.16.32.42
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 14 Dec 2010 16:32:43 -0800 (PST)
From: Tracey Dent <tdent48227@gmail.com>
To: sage@newdream.net
Cc: ceph-devel@vger.kernel.org, Tracey Dent <tdent48227@gmail.com>
Subject: [PATCH][GIT PULL] Ceph: Makefile: Remove unnessary code
Date: Tue, 14 Dec 2010 19:32:37 -0500
Message-Id: <1292373157-2861-1-git-send-email-tdent48227@gmail.com>
X-Mailer: git-send-email 1.7.3.3.489.g44430
Sender: ceph-devel-owner@vger.kernel.org
Precedence: bulk
List-ID: <ceph-devel.vger.kernel.org>
X-Mailing-List: ceph-devel@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Wed, 15 Dec 2010 00:32:59 +0000 (UTC)


diff --git a/fs/ceph/Makefile b/fs/ceph/Makefile
index 9e6c4f2..bd35212 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