=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-09-23 12:56:33 +0000
@@ -0,0 +1,5 @@
+**/.deps-core
+**/.deps-util
+**/.dirstamp
+Makefile.core.am
+Makefile.util.am

=== added file 'Makefile.common'
--- Makefile.common	1970-01-01 00:00:00 +0000
+++ Makefile.common	2010-09-21 17:44:33 +0000
@@ -0,0 +1,2 @@
+ZFS_CPPFLAGS = -Icontrib/zfs/include
+ZFS_CFLAGS = -Wno-error

=== added file 'Makefile.core.def'
--- Makefile.core.def	1970-01-01 00:00:00 +0000
+++ Makefile.core.def	2010-09-22 08:25:58 +0000
@@ -0,0 +1,18 @@
+AutoGen definitions Makefile.tpl;
+
+module = {
+  name = zfs;
+  common = contrib/zfs/zfs.c;
+  common = contrib/zfs/zfs_lzjb.c;
+  common = contrib/zfs/zfs_sha256.c;
+  common = contrib/zfs/zfs_fletcher.c;
+  cppflags = '$(ZFS_CPPFLAGS)';
+  cflags = '$(ZFS_CFLAGS)';
+};
+
+module = {
+  name = zfsinfo;
+  common = contrib/zfs/zfsinfo.c;
+  cppflags = '$(ZFS_CPPFLAGS)';
+  cflags = '$(ZFS_CFLAGS)';
+};

=== added file 'Makefile.util.def'
--- Makefile.util.def	1970-01-01 00:00:00 +0000
+++ Makefile.util.def	2010-09-22 21:06:18 +0000
@@ -0,0 +1,11 @@
+AutoGen definitions Makefile.tpl;
+
+library = {
+  name = libgrub.a;
+  common = contrib/zfs/zfs.c;
+  common = contrib/zfs/zfs_lzjb.c;
+  common = contrib/zfs/zfs_sha256.c;
+  common = contrib/zfs/zfs_fletcher.c;
+  cppflags = '$(ZFS_CPPFLAGS)';
+  cflags = '$(ZFS_CFLAGS)';
+};

=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk	2009-10-26 20:15:26 +0000
+++ conf/common.rmk	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS += -I$(GRUB_CONTRIB)/zfs/include
-
-pkglib_MODULES += zfs.mod
-zfs_mod_SOURCES = $(GRUB_CONTRIB)/zfs/zfs.c $(GRUB_CONTRIB)/zfs/zfs_lzjb.c $(GRUB_CONTRIB)/zfs/zfs_sha256.c $(GRUB_CONTRIB)/zfs/zfs_fletcher.c
-zfs_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-zfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += zfsinfo.mod
-zfsinfo_mod_SOURCES = $(GRUB_CONTRIB)/zfs/zfsinfo.c
-zfsinfo_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-zfsinfo_mod_LDFLAGS = $(COMMON_LDFLAGS)