Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / fs / xfs / Makefile

diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index fee7901..284a7c8 100644 (file)
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -16,14 +16,11 @@
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 

-EXTRA_CFLAGS +=         -I$(src) -I$(src)/linux-2.6
+ccflags-y := -I$(src) -I$(src)/linux-2.6
+ccflags-$(CONFIG_XFS_DEBUG) += -g

 
 XFS_LINUX := linux-2.6
 
 
 XFS_LINUX := linux-2.6
 

-ifeq ($(CONFIG_XFS_DEBUG),y)
-       EXTRA_CFLAGS += -g
-endif
-

 obj-$(CONFIG_XFS_FS)           += xfs.o
 
 xfs-y                          += linux-2.6/xfs_trace.o
 obj-$(CONFIG_XFS_FS)           += xfs.o
 
 xfs-y                          += linux-2.6/xfs_trace.o