aboutsummaryrefslogtreecommitdiffstats
path: root/com32/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-14 13:57:50 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-14 13:57:50 -0800
commit3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea (patch)
tree468f0e19dfbbf773ddd980211b042f4402919c03 /com32/Makefile
parent5e50b4d4faf398f072c0dea814b11db1a95efeec (diff)
parentb82686b524d2ee4441ce411fa6db3a210edbaa34 (diff)
downloadsyslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.gz
syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.xz
syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.zip
Merge branch 'master' into pathbasedsyslinux-4.00-pre20
Resolved Conflicts: com32/Makefile com32/include/syslinux/pxe.h core/pxelinux.asm core/syslinux.ld Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/Makefile')
-rw-r--r--com32/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/com32/Makefile b/com32/Makefile
index 89d0694e..4f95017a 100644
--- a/com32/Makefile
+++ b/com32/Makefile
@@ -1,3 +1,4 @@
-SUBDIRS = tools lib gpllib libutil modules mboot menu samples rosh cmenu hdt gfxboot
+SUBDIRS = tools lib gpllib libutil modules mboot menu samples rosh cmenu \
+ hdt gfxboot sysdump
all tidy dist clean spotless install:
set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done