aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-02-04 15:59:37 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-02-04 15:59:37 -0800
commit56810d7d98194e14c354ac58e1ac5b9d07ce6a2b (patch)
tree8e18c868a39b1ee657014f717a43c31face9db19 /Makefile
parent7cfd6f9dd9a73eb18c10948aaa0e56a52e0a4228 (diff)
downloadsyslinux-elf-56810d7d98194e14c354ac58e1ac5b9d07ce6a2b.tar.gz
syslinux-elf-56810d7d98194e14c354ac58e1ac5b9d07ce6a2b.tar.xz
syslinux-elf-56810d7d98194e14c354ac58e1ac5b9d07ce6a2b.zip
New MBR which supports logical partitions.
New MBR which supports logical partitions. Move the MBR to a subdirectory, and convert it to gas with the expectation of including it in util-linux.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7673cf5c..5814897f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,16 @@ BINFILES = bootsect_bin.c ldlinux_bin.c mbr_bin.c \
# mingw suite installed
BTARGET = kwdhash.gen version.gen version.h \
ldlinux.bss ldlinux.sys ldlinux.bin \
- pxelinux.0 mbr.bin isolinux.bin isolinux-debug.bin \
+ pxelinux.0 isolinux.bin isolinux-debug.bin \
extlinux.bin extlinux.bss extlinux.sys
-BOBJECTS = $(BTARGET) dos/syslinux.com win32/syslinux.exe memdisk/memdisk
+BOBJECTS = $(BTARGET) mbr/mbr.bin dos/syslinux.com win32/syslinux.exe memdisk/memdisk
+# BESUBDIRS and IESUBDIRS are "early", i.e. before the root; BSUBDIRS
+# and ISUBDIRS are "late", after the root.
+BESUBDIRS = mbr
BSUBDIRS = memdisk dos win32
ITARGET = copybs.com gethostip mkdiskimage
IOBJECTS = $(ITARGET) mtools/syslinux unix/syslinux extlinux/extlinux
+IESUBDIRS =
ISUBDIRS = mtools unix extlinux sample com32
DOCS = COPYING NEWS README TODO BUGS *.doc sample menu com32
OTHER = Makefile bin2c.pl now.pl genhash.pl keywords findpatch.pl \
@@ -102,9 +106,10 @@ MAKE += DATE=$(DATE) HEXDATE=$(HEXDATE)
# error every time you try to build.
#
-all: all-local
- set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done
+all:
+ set -e ; for i in $(BESUBDIRS) $(IESUBDIRS) ; do $(MAKE) -C $$i $@ ; done
$(MAKE) all-local
+ set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done
-ls -l $(BOBJECTS) $(IOBJECTS)
all-local: $(BTARGET) $(ITARGET) $(BINFILES)
@@ -167,10 +172,7 @@ extlinux.bss: extlinux.bin
extlinux.sys: extlinux.bin
dd if=$< of=$@ bs=512 skip=1
-mbr.bin: mbr.asm
- $(NASM) -f bin -l mbr.lst -o mbr.bin mbr.asm
-
-mbr_bin.c: mbr.bin bin2c.pl
+mbr_bin.c: mbr/mbr.bin bin2c.pl
$(PERL) bin2c.pl syslinux_mbr < $< > $@
copybs.com: copybs.asm