aboutsummaryrefslogtreecommitdiffstats
path: root/com32/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:46:34 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:46:34 +0100
commit10d05cbef13345ef3730234c1da7b0a34cdca9b6 (patch)
treed5a582d888db9c2dc360c9005c133b713f248e55 /com32/Makefile
parent844e965443e08133a7a366a496d8cc52ef93ca48 (diff)
parentd7d20a78c72237f85d8508c93aa411529d0ac17a (diff)
downloadsyslinux-10d05cbef13345ef3730234c1da7b0a34cdca9b6.tar.gz
syslinux-10d05cbef13345ef3730234c1da7b0a34cdca9b6.tar.xz
syslinux-10d05cbef13345ef3730234c1da7b0a34cdca9b6.zip
Merge remote-tracking branch 'zytor/master' into elflink
We need the recent Makefile filename changes to be merged into the elflink branch because it will make things simpler when converting all modules to ELF format. Conflicts: com32/Makefile com32/modules/Makefile version
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 bc13cf62..d2492359 100644
--- a/com32/Makefile
+++ b/com32/Makefile
@@ -1,4 +1,5 @@
-SUBDIRS = tools lib gpllib libutil modules mboot menu samples elflink elflink/modules rosh cmenu \
+SUBDIRS = libupload tools lib gpllib libutil modules mboot menu samples elflink elflink/modules rosh cmenu \
hdt gfxboot sysdump lua/src elflink/ldlinux
+
all tidy dist clean spotless install:
set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done