Return to Makefile-linux-2.6 CVS log

Up to [Development] / linux-2.6-xfs / mainline-patches

Merge of 2.6.x-xfs-melb:linux:27935a by kenmcd.

  Reinstate delete file.

Support for kdb.

--- /home/chatz/isms/linux-2.6.19/fs/xfs/Makefile-linux-2.6	2006-11-30 08:57:37.000000000 +1100
+++ Makefile-linux-2.6	2006-12-15 22:56:23.782395794 +1100
@@ -25,18 +25,8 @@
 endif
 
 obj-$(CONFIG_XFS_FS)		+= xfs.o
-
-xfs-$(CONFIG_XFS_QUOTA)		+= $(addprefix quota/, \
-				   xfs_dquot.o \
-				   xfs_dquot_item.o \
-				   xfs_trans_dquot.o \
-				   xfs_qm_syscalls.o \
-				   xfs_qm_bhv.o \
-				   xfs_qm.o)
-
-ifeq ($(CONFIG_XFS_QUOTA),y)
-xfs-$(CONFIG_PROC_FS)		+= quota/xfs_qm_stats.o
-endif
+obj-$(CONFIG_XFS_QUOTA)		+= quota/
+obj-$(CONFIG_XFS_DMAPI)		+= dmapi/
 
 xfs-$(CONFIG_XFS_RT)		+= xfs_rtalloc.o
 xfs-$(CONFIG_XFS_POSIX_ACL)	+= xfs_acl.o
@@ -107,7 +97,8 @@
 				   xfs_lrw.o \
 				   xfs_super.o \
 				   xfs_vfs.o \
-				   xfs_vnode.o)
+				   xfs_vnode.o \
+				   xfs_ksyms.o) 
 
 # Objects in support/
 xfs-y				+= $(addprefix support/, \
@@ -117,3 +108,17 @@
 
 xfs-$(CONFIG_XFS_TRACE)		+= support/ktrace.o
 
+# If both xfs and kdb modules are built in then xfsidbg is built in.  If xfs is
+# a module and kdb modules are being compiled then xfsidbg must be a module, to
+# follow xfs.  If xfs is built in then xfsidbg tracks the kdb module state.
+# This must come after the main xfs code so xfs initialises before xfsidbg.
+# KAO
+ifneq ($(CONFIG_KDB_MODULES),)
+  ifeq ($(CONFIG_XFS_FS),y)
+    obj-$(CONFIG_KDB_MODULES)	+= xfsidbg.o
+  else
+    obj-$(CONFIG_XFS_FS)	+= xfsidbg.o
+  endif
+endif
+
+CFLAGS_xfsidbg.o += -Iarch/$(ARCH)/kdb