From: Vladimir V. Saveliev <vs@namesys.com>

This patch makes reiser4 to build as one module again.

Signed-off-by: Vladimir V. Saveliev <vs@namesys.com>
Signed-off-by: Hans Reiser <reiser@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/reiser4/Makefile |  139 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 93 insertions(+), 46 deletions(-)

diff -puN fs/reiser4/Makefile~reiser4-back-to-one-makefile fs/reiser4/Makefile
--- devel/fs/reiser4/Makefile~reiser4-back-to-one-makefile	2005-11-16 17:34:08.000000000 -0800
+++ devel-akpm/fs/reiser4/Makefile	2005-11-16 17:34:08.000000000 -0800
@@ -4,50 +4,97 @@
 
 obj-$(CONFIG_REISER4_FS) += reiser4.o
 
-reiser4-objs := 		\
-	debug.o			\
-	jnode.o			\
-	znode.o			\
-	key.o			\
-	pool.o			\
-	tree_mod.o		\
-	estimate.o		\
-	carry.o			\
-	carry_ops.o		\
-	lock.o			\
-	tree.o			\
-	context.o		\
-	tap.o			\
-	coord.o			\
-	block_alloc.o		\
-	txnmgr.o		\
-	kassign.o		\
-	flush.o			\
-	wander.o		\
-	eottl.o			\
-	search.o		\
-	page_cache.o		\
-	seal.o			\
-	dscale.o		\
-	flush_queue.o		\
-	ktxnmgrd.o		\
-	blocknrset.o		\
-	super.o			\
-	super_ops.o		\
-	fsdata.o		\
-	export_ops.o		\
-	oid.o			\
-	tree_walk.o		\
-	inode.o			\
-	vfs_ops.o		\
-	as_ops.o		\
-	emergency_flush.o	\
-	entd.o			\
-	readahead.o		\
-	cluster.o		\
-	crypt.o			\
-	status_flags.o		\
-	init_super.o		\
-	safe_link.o
+reiser4-y := \
+		   debug.o \
+		   jnode.o \
+		   znode.o \
+		   key.o \
+		   pool.o \
+		   tree_mod.o \
+		   estimate.o \
+		   carry.o \
+		   carry_ops.o \
+		   lock.o \
+		   tree.o \
+		   context.o \
+		   tap.o \
+		   coord.o \
+		   block_alloc.o \
+		   txnmgr.o \
+		   kassign.o \
+		   flush.o \
+		   wander.o \
+		   eottl.o \
+		   search.o \
+		   page_cache.o \
+		   seal.o \
+		   dscale.o \
+		   flush_queue.o \
+		   ktxnmgrd.o \
+		   blocknrset.o \
+		   super.o \
+		   super_ops.o \
+		   fsdata.o \
+		   export_ops.o \
+		   oid.o \
+		   tree_walk.o \
+		   inode.o \
+		   vfs_ops.o \
+		   as_ops.o \
+		   emergency_flush.o \
+		   entd.o\
+		   readahead.o \
+		   cluster.o \
+		   crypt.o \
+		   status_flags.o \
+		   init_super.o \
+		   safe_link.o \
+           \
+		   plugin/plugin.o \
+		   plugin/plugin_set.o \
+		   plugin/node/node.o \
+		   plugin/object.o \
+		   plugin/inode_ops.o \
+		   plugin/inode_ops_rename.o \
+		   plugin/file_ops.o \
+		   plugin/file_ops_readdir.o \
+		   plugin/file_plugin_common.o \
+		   plugin/file/file.o \
+		   plugin/file/tail_conversion.o \
+		   plugin/file/symlink.o \
+		   plugin/file/cryptcompress.o \
+		   plugin/dir_plugin_common.o \
+		   plugin/dir/hashed_dir.o \
+		   plugin/dir/seekable_dir.o \
+		   plugin/digest.o \
+		   plugin/node/node40.o \
+           \
+		   plugin/compress/minilzo.o \
+		   plugin/compress/compress.o \
+		   plugin/compress/compress_mode.o \
+           \
+		   plugin/item/static_stat.o \
+		   plugin/item/sde.o \
+		   plugin/item/cde.o \
+		   plugin/item/blackbox.o \
+		   plugin/item/internal.o \
+		   plugin/item/tail.o \
+		   plugin/item/ctail.o \
+		   plugin/item/extent.o \
+		   plugin/item/extent_item_ops.o \
+		   plugin/item/extent_file_ops.o \
+		   plugin/item/extent_flush_ops.o \
+           \
+		   plugin/hash.o \
+		   plugin/fibration.o \
+		   plugin/tail_policy.o \
+		   plugin/item/item.o \
+           \
+		   plugin/security/perm.o \
+		   plugin/space/bitmap.o \
+           \
+		   plugin/disk_format/disk_format40.o \
+		   plugin/disk_format/disk_format.o \
+	   \
+		   plugin/regular.o
 
-obj-$(CONFIG_REISER4_FS) += plugin/
_