diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-14 13:57:50 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-14 13:57:50 -0800 |
| commit | 3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea (patch) | |
| tree | 468f0e19dfbbf773ddd980211b042f4402919c03 /Makefile | |
| parent | 5e50b4d4faf398f072c0dea814b11db1a95efeec (diff) | |
| parent | b82686b524d2ee4441ce411fa6db3a210edbaa34 (diff) | |
| download | syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.gz | |
Merge branch 'master' into pathbasedsyslinux-4.00-pre20
Resolved Conflicts:
com32/Makefile
com32/include/syslinux/pxe.h
core/pxelinux.asm
core/syslinux.ld
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -32,7 +32,8 @@ include $(topdir)/MCONFIG # List of module objects that should be installed for all derivatives MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \ com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \ - com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 + com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \ + com32/sysdump/*.c32 # syslinux.exe is BTARGET so as to not require everyone to have the # mingw suite installed |