aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-12-07 11:33:45 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-12-07 11:33:45 +0000
commit10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch)
treed8ee3bfc6e55e739e0f135cd6d945955c670dd46 /Makefile
parent35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff)
parentddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff)
downloadsyslinux-10f6cf6eef0a7da7dad1933efdbfb101155792d0.tar.gz
syslinux-10f6cf6eef0a7da7dad1933efdbfb101155792d0.tar.xz
syslinux-10f6cf6eef0a7da7dad1933efdbfb101155792d0.zip
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts: Makefile com32/elflink/ldlinux/Makefile com32/lib/sys/module/elf_module.c core/cleanup.c core/comboot.inc core/conio.c core/fs/fs.c core/init.c core/mem/free.c core/mem/malloc.c core/timer.inc diag/geodsp/Makefile extlinux/main.c mk/embedded.mk modules/Makefile Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a04f6321..7add22e7 100644
--- a/Makefile
+++ b/Makefile
@@ -123,12 +123,12 @@ include $(MAKEDIR)/syslinux.mk
#
ifndef EFI_BUILD
-MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \
+MODULES = memdisk/memdisk memdump/memdump.com \
com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \
com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \
com32/sysdump/*.c32 com32/lua/src/*.c32 com32/chain/*.c32 \
com32/lib/*.c32 com32/libutil/*.c32 com32/gpllib/*.c32 \
- com32/elflink/ldlinux/*.c32
+ com32/elflink/ldlinux/*.c32 com32/cmenu/libmenu/*.c32
else
# memdump is BIOS specific code exclude it for EFI
# FIXME: Prune other BIOS-centric modules
@@ -136,11 +136,11 @@ MODULES = com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \
com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \
com32/sysdump/*.c32 com32/lua/src/*.c32 com32/chain/*.c32 \
com32/lib/*.c32 com32/libutil/*.c32 com32/gpllib/*.c32 \
- com32/elflink/ldlinux/*.c32
+ com32/elflink/ldlinux/*.c32 com32/cmenu/libmenu/*.c32
endif
# List of module objects that should be installed for all derivatives
-INSTALLABLE_MODULES = $(filter-out com32/gpllib%,$(MODULES))
+INSTALLABLE_MODULES = $(MODULES)
# syslinux.exe is BTARGET so as to not require everyone to have the
# mingw suite installed
@@ -162,7 +162,7 @@ BOBJECTS = $(BTARGET) \
ifdef EFI_BUILD
-BSUBDIRS = codepage com32 lzo core modules mbr sample efi
+BSUBDIRS = codepage com32 lzo core mbr sample efi
ISUBDIRS = efi utils
INSTALLSUBDIRS = efi
@@ -170,7 +170,7 @@ INSTALLSUBDIRS = efi
else
BSUBDIRS = codepage com32 lzo core memdisk sample diag mbr memdump dos \
- modules gpxe libinstaller win32 win64 dosutil
+ gpxe libinstaller win32 win64 dosutil
ITARGET =
IOBJECTS = $(ITARGET) \