aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-01-18 16:12:25 -0800
committerH. Peter Anvin <hpa@zytor.com>2014-01-18 16:12:25 -0800
commitba3c1d66fc9f6638ea22949e71d10dc4f7e83796 (patch)
treeed8faa89356c801de088a99c42ccb3b4ba75790e
parent71a3d797f62b0d7560cb52e148f65fa9375965bf (diff)
parentb4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (diff)
downloadsyslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.gz
syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.xz
syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.zip
Merge remote-tracking branch 'origin/syslinux-5.xx'
Resolved Conflicts: version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--dos/Makefile2
-rw-r--r--extlinux/Makefile2
-rw-r--r--linux/Makefile2
-rw-r--r--memdump/Makefile2
-rwxr-xr-xmtools/Makefile2
-rw-r--r--win32/Makefile2
-rw-r--r--win32/ntfstest/Makefile2
-rw-r--r--win64/Makefile2
-rw-r--r--win64/ntfstest/Makefile2
9 files changed, 9 insertions, 9 deletions
diff --git a/dos/Makefile b/dos/Makefile
index 6cf81b72..b9c337d5 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -76,4 +76,4 @@ syslinux.com: syslinux.elf
ldlinux.o: ldlinux.S $(OBJ)/../core/ldlinux.sys
--include .*.d *.tmp
+-include .*.d
diff --git a/extlinux/Makefile b/extlinux/Makefile
index 91486880..02d1db51 100644
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -64,4 +64,4 @@ strip:
%.s: %.c
$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/linux/Makefile b/linux/Makefile
index f88a6cb3..11667e1d 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -66,4 +66,4 @@ strip:
%.s: %.c
$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/memdump/Makefile b/memdump/Makefile
index ae2b3f0e..12a23bb9 100644
--- a/memdump/Makefile
+++ b/memdump/Makefile
@@ -66,4 +66,4 @@ memdump.com: memdump.elf
%.s: %.S
$(CC) $(MAKEDEPS) $(SFLAGS) -E -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/mtools/Makefile b/mtools/Makefile
index 3f9c42b3..70269efd 100755
--- a/mtools/Makefile
+++ b/mtools/Makefile
@@ -46,4 +46,4 @@ strip:
%.s: %.c
$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/win32/Makefile b/win32/Makefile
index a417a4b8..437f954e 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -101,4 +101,4 @@ syslinux.exe: $(OBJS) $(LIB)
%.s: %.c
$(WINCC) $(UMAKEDEPS) $(WINCFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/win32/ntfstest/Makefile b/win32/ntfstest/Makefile
index 00e89cf9..04837ca6 100644
--- a/win32/ntfstest/Makefile
+++ b/win32/ntfstest/Makefile
@@ -84,4 +84,4 @@ ntfstest.exe: $(OBJS) $(RESS)
%.res: %.rc
$(WINDRES) -O COFF $< $@
--include .*.d *.tmp
+-include .*.d
diff --git a/win64/Makefile b/win64/Makefile
index 176f8482..ae47e2e5 100644
--- a/win64/Makefile
+++ b/win64/Makefile
@@ -91,4 +91,4 @@ syslinux64.exe: $(OBJS) $(LIB)
%.s: %.c
$(WINCC) $(UMAKEDEPS) $(WINCFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/win64/ntfstest/Makefile b/win64/ntfstest/Makefile
index 5b975be5..120d4c9c 100644
--- a/win64/ntfstest/Makefile
+++ b/win64/ntfstest/Makefile
@@ -73,4 +73,4 @@ ntfstest64.exe: $(OBJS) $(RESS)
%.res: %.rc
$(WINDRES) -O COFF $< $@
--include .*.d *.tmp
+-include .*.d