aboutsummaryrefslogtreecommitdiffstats
path: root/mtools/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-01-18 16:11:39 -0800
committerH. Peter Anvin <hpa@zytor.com>2014-01-18 16:11:39 -0800
commitb4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (patch)
tree1dadca813cdf5fd8d78494d9342237badac5dc96 /mtools/Makefile
parentf77bb1d32dd96036661fc4f62045dcb04414056b (diff)
parent374a37434fa11bdc95e0bc243aadb7de36bbbf43 (diff)
downloadsyslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.tar.gz
syslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.tar.xz
syslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.zip
Merge remote-tracking branch 'origin/syslinux-4.xx' into syslinux-5.xx
Resolved Conflicts: version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'mtools/Makefile')
-rwxr-xr-xmtools/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/mtools/Makefile b/mtools/Makefile
index 6df18b52..7d857be2 100755
--- a/mtools/Makefile
+++ b/mtools/Makefile
@@ -48,4 +48,4 @@ strip:
%.s: %.c
$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d