diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-03-20 17:14:21 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-03-22 13:57:44 +0000 |
| commit | 37d43cf9dd5dd2d2cef1e86aa651097473fd0b48 (patch) | |
| tree | 07a7df546f178c4e1576f4cbcc0bb4db3a8e18b4 /Makefile | |
| parent | bf20364b582c383b4927f898de213b1cc0981a80 (diff) | |
| parent | a107cb3b6fa219cf5f65bef366c9b00b108e9a3a (diff) | |
| download | syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.gz syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.xz syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.zip | |
Merge tag 'syslinux-5.10-pre2' into for-hpa/elflink/firmware
syslinux-5.10-pre2
Conflicts:
NEWS
com32/include/netinet/in.h
com32/include/sys/cpu.h
com32/lib/Makefile
core/Makefile
core/fs/diskio.c
core/fs/pxe/pxe.h
core/init.c
core/mem/free.c
core/mem/malloc.c
mk/devel.mk
version
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -147,7 +147,8 @@ INSTALLABLE_MODULES = $(MODULES) BTARGET = version.gen version.h $(OBJDIR)/version.mk BOBJECTS = $(BTARGET) \ mbr/*.bin \ - core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ + core/pxelinux.0 core/lpxelinux.0 \ + core/isolinux.bin core/isolinux-debug.bin \ gpxe/gpxelinux.0 dos/syslinux.com \ win32/syslinux.exe win64/syslinux64.exe \ dosutil/*.com dosutil/*.sys \ @@ -185,7 +186,7 @@ INSTALL_SBIN = extlinux/extlinux # Things to install in /usr/lib/syslinux INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \ core/isolinux.bin core/isolinux-debug.bin \ - dos/syslinux.com \ + dos/syslinux.com core/lpxelinux.0 \ mbr/*.bin $(INSTALLABLE_MODULES) INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe INSTALL_DIAG = diag/mbr/handoff.bin \ @@ -198,7 +199,7 @@ INSTALLSUBDIRS = com32 utils dosutil EXTBOOTINSTALL = $(INSTALLABLE_MODULES) # Things to install in /tftpboot -NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \ +NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 core/lpxelinux.0 \ $(INSTALLABLE_MODULES) endif # ifdef EFI_BUILD |