aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-29 14:01:07 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-29 15:11:28 +0000
commitbf20364b582c383b4927f898de213b1cc0981a80 (patch)
tree5412e0c14cf74df0d7ea29ff182e23d3281aac3e /Makefile
parentafd985f6eec18a0f66a8fc55f9c5e3431128310f (diff)
parenta2d79191b501276026a0a16ec2fa664630a20476 (diff)
downloadsyslinux-bf20364b582c383b4927f898de213b1cc0981a80.tar.gz
syslinux-bf20364b582c383b4927f898de213b1cc0981a80.tar.xz
syslinux-bf20364b582c383b4927f898de213b1cc0981a80.zip
Merge tag 'syslinux-5.01' into firmwaresyslinux-6.00-pre4
Conflicts: Makefile NEWS com32/cmenu/Makefile com32/elflink/ldlinux/Makefile com32/gfxboot/Makefile com32/gpllib/Makefile com32/include/sys/module.h com32/lib/Makefile com32/lib/sys/module/elf_module.c com32/menu/Makefile com32/rosh/Makefile com32/samples/Makefile core/init.c mk/elf.mk Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7add22e7..e7d89d90 100644
--- a/Makefile
+++ b/Makefile
@@ -162,15 +162,15 @@ BOBJECTS = $(BTARGET) \
ifdef EFI_BUILD
-BSUBDIRS = codepage com32 lzo core mbr sample efi
+BSUBDIRS = codepage com32 lzo core mbr sample efi txt
ISUBDIRS = efi utils
INSTALLSUBDIRS = efi
else
-BSUBDIRS = codepage com32 lzo core memdisk sample diag mbr memdump dos \
- gpxe libinstaller win32 win64 dosutil
+BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
+ diag libinstaller dos win32 win64 dosutil txt
ITARGET =
IOBJECTS = $(ITARGET) \