diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:13:25 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:21:04 +0000 |
| commit | 0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd (patch) | |
| tree | 9a892c852fabd0a75d10c856105b4488cc87f66c /Makefile | |
| parent | cdeba8ac82f529a3a4a544c4e8346887ef81cb74 (diff) | |
| parent | b210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff) | |
| download | syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.gz syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.xz syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.zip | |
Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware
This merge also includes the Syslinux-4.06 release.
Conflicts:
Makefile
com32/hdt/Makefile
com32/modules/Makefile
com32/samples/hello.c
mtools/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -111,7 +111,6 @@ include $(MAKEDIR)/syslinux.mk # directories. # -# List of module objects that should be installed for all derivatives ifndef EFI_BUILD MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \ com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \ @@ -129,6 +128,9 @@ MODULES = com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \ com32/elflink/ldlinux/*.c32 endif +# List of module objects that should be installed for all derivatives +INSTALLABLE_MODULES = $(filter-out com32/gpllib%,$(MODULES)) + # syslinux.exe is BTARGET so as to not require everyone to have the # mingw suite installed BTARGET = version.gen version.h version.mk @@ -173,7 +175,7 @@ INSTALL_SBIN = extlinux/extlinux INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \ core/isolinux.bin core/isolinux-debug.bin \ dos/syslinux.com \ - mbr/*.bin $(MODULES) + mbr/*.bin $(INSTALLABLE_MODULES) INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe INSTALL_DIAG = diag/mbr/handoff.bin \ diag/geodsp/geodsp1s.img.xz diag/geodsp/geodspms.img.xz @@ -182,11 +184,11 @@ INSTALL_DIAG = diag/mbr/handoff.bin \ INSTALLSUBDIRS = com32 utils dosutil # Things to install in /boot/extlinux -EXTBOOTINSTALL = $(MODULES) +EXTBOOTINSTALL = $(INSTALLABLE_MODULES) # Things to install in /tftpboot NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \ - $(MODULES) + $(INSTALLABLE_MODULES) endif # ifdef EFI_BUILD |