=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-09-21 18:01:28 +0000
@@ -0,0 +1,3 @@
+**/.deps-core
+**/.dirstamp
+Makefile.core.am

=== added file 'Makefile.core.common'
--- Makefile.core.common	1970-01-01 00:00:00 +0000
+++ Makefile.core.common	2010-09-23 12:13:53 +0000
@@ -0,0 +1,27 @@
+# Compatibility symlink.
+noinst_PROGRAMS += g2hdr.bin
+g2hdr.bin: g2hdr.img
+	rm -f $@
+	$(LN_S) $< $@
+CLEANFILES += g2hdr.bin
+
+grldr.mbr: grldr.img
+	head -c 8192 $< > $@
+CLEANFILES += grldr.mbr
+
+bin2h: contrib/ntldr-img/bin2h.c
+	$(CC) $^ -o $@
+CLEANFILES += bin2h
+
+grub_mbr.h: grldr.mbr bin2h
+	./bin2h grub_mbr 8192 < $< > $@
+CLEANFILES += grub_mbr.h
+
+grubinst: contrib/ntldr-img/grubinst.c contrib/ntldr-img/utils.c grub_mbr.h
+	$(CC) -I. -Icontrib/ntldr-img -DLINUX -o $@ contrib/ntldr-img/grubinst.c contrib/ntldr-img/utils.c
+CLEANFILES += grubinst
+
+noinst_PROGRAMS += g2ldr.mbr
+g2ldr.mbr: grubinst
+	./grubinst --grub2 -o $@
+CLEANFILES += g2ldr.mbr

=== added file 'Makefile.core.def'
--- Makefile.core.def	1970-01-01 00:00:00 +0000
+++ Makefile.core.def	2010-09-22 12:12:29 +0000
@@ -0,0 +1,21 @@
+AutoGen definitions Makefile.tpl;
+
+image = {
+  name = g2hdr;
+  i386_pc = contrib/ntldr-img/g2hdr.S;
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x0';
+  objcopyflags = '-O binary';
+  enable = i386_pc;
+};
+
+image = {
+  name = grldr;
+  i386_pc = contrib/ntldr-img/grldrstart.S;
+  i386_pc = contrib/ntldr-img/ntfsbs.S;
+  i386_pc_ccasflags = -DGRLDR_MBR;
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7c00';
+  objcopyflags = '-O binary';
+  enable = i386_pc;
+};

=== removed directory 'conf'
=== removed file 'conf/common.rmk'
--- conf/common.rmk	2009-11-29 21:12:28 +0000
+++ conf/common.rmk	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# -*- makefile -*-
--include $(GRUB_CONTRIB)/ntldr-img/conf/$(target_cpu)-$(platform).mk

=== removed file 'conf/i386-pc.rmk'
--- conf/i386-pc.rmk	2009-11-30 02:37:58 +0000
+++ conf/i386-pc.rmk	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# -*- makefile -*-
-
-pkglib_IMAGES += g2ldr.mbr g2hdr.bin grldr.img
-
-all: g2ldr.mbr g2hdr.bin
-
-DISTCLEANFILES += g2ldr.mbr g2hdr.bin
-
-g2hdr_bin_SOURCES = $(GRUB_CONTRIB)/ntldr-img/g2hdr.S
-g2hdr_bin_ASFLAGS = $(COMMON_ASFLAGS)
-g2hdr_bin_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x0
-g2hdr_bin_FORMAT = binary
-
-grldr_img_SOURCES = $(GRUB_CONTRIB)/ntldr-img/grldrstart.S $(GRUB_CONTRIB)/ntldr-img/ntfsbs.S
-grldr_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRLDR_MBR
-grldr_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7c00
-grldr_img_FORMAT = binary
-
-grldr.mbr: grldr.img
-	head -c 8192 $< > $@
-DISTCLEANFILES += grldr.mbr
-
-bin2h: $(GRUB_CONTRIB)/ntldr-img/bin2h.c
-	$(CC) $^ -o $@
-DISTCLEANFILES += bin2h
-
-grub_mbr.h: grldr.mbr bin2h
-	./bin2h grub_mbr 8192 < $< > $@
-DISTCLEANFILES += grub_mbr.h
-
-grubinst: $(GRUB_CONTRIB)/ntldr-img/grubinst.c $(GRUB_CONTRIB)/ntldr-img/utils.c grub_mbr.h
-	$(CC) -I. -I$(GRUB_CONTRIB)/ntldr-img -DLINUX -o $@ $(GRUB_CONTRIB)/ntldr-img/grubinst.c $(GRUB_CONTRIB)/ntldr-img/utils.c
-DISTCLEANFILES += grubinst
-
-g2ldr.mbr: grubinst
-	./grubinst --grub2 -o $@
-DISTCLEANFILES += g2ldr.mbr