aboutsummaryrefslogtreecommitdiffstats
path: root/linux/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-05 13:13:25 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-05 13:21:04 +0000
commit0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd (patch)
tree9a892c852fabd0a75d10c856105b4488cc87f66c /linux/Makefile
parentcdeba8ac82f529a3a4a544c4e8346887ef81cb74 (diff)
parentb210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff)
downloadsyslinux-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 'linux/Makefile')
-rw-r--r--linux/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/Makefile b/linux/Makefile
index d63306af..f88a6cb3 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -29,6 +29,7 @@ SRCS = syslinux.c \
../libinstaller/fs.c \
../libinstaller/syslxmod.c \
../libinstaller/bootsect_bin.c \
+ ../libinstaller/ldlinuxc32_bin.c \
../libinstaller/ldlinux_bin.c
OBJS = $(patsubst %.c,%.o,$(notdir $(SRCS)))