[syslinux:syslinux-4.xx] Makefiles: don't include *.tmp

syslinux-bot for H. Peter Anvin hpa at zytor.com
Sat Jan 18 16:12:03 PST 2014


Commit-ID:  374a37434fa11bdc95e0bc243aadb7de36bbbf43
Gitweb:     http://www.syslinux.org/commit/374a37434fa11bdc95e0bc243aadb7de36bbbf43
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sat, 18 Jan 2014 16:09:19 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Sat, 18 Jan 2014 16:09:19 -0800

Makefiles: don't include *.tmp

Since checkin:

bd09a6d828fa Major Makefile cleanups; gcc 4.3.0 compatiblity

... we include *.tmp into the Makefiles as well as .*.d.  This seems
to have been a mistake in made when adding *.tmp to cleanup rules,
probably using a sed script.

This causes problems, because *.tmp files are generated by the gcc_ok
macro and do not contain Makefile rules at all.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>

---
 dos/Makefile            | 2 +-
 extlinux/Makefile       | 2 +-
 linux/Makefile          | 2 +-
 memdump/Makefile        | 2 +-
 mtools/Makefile         | 2 +-
 win32/Makefile          | 2 +-
 win32/ntfstest/Makefile | 2 +-
 win64/Makefile          | 2 +-
 win64/ntfstest/Makefile | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dos/Makefile b/dos/Makefile
index f942008..afb279d 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -76,4 +76,4 @@ syslinux.com: syslinux.elf
 
 ldlinux.o: ldlinux.S ../core/ldlinux.sys
 
--include .*.d *.tmp
+-include .*.d
diff --git a/extlinux/Makefile b/extlinux/Makefile
index 6cde574..2c552f9 100644
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -65,4 +65,4 @@ strip:
 %.s: %.c
 	$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
 
--include .*.d *.tmp
+-include .*.d
diff --git a/linux/Makefile b/linux/Makefile
index 08a3ed4..9352f0c 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -67,4 +67,4 @@ strip:
 %.s: %.c
 	$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
 
--include .*.d *.tmp
+-include .*.d
diff --git a/memdump/Makefile b/memdump/Makefile
index 6a30431..a327e83 100644
--- a/memdump/Makefile
+++ b/memdump/Makefile
@@ -65,4 +65,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 78cea1e..61e19f7 100755
--- a/mtools/Makefile
+++ b/mtools/Makefile
@@ -47,4 +47,4 @@ strip:
 %.s: %.c
 	$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
 
--include .*.d *.tmp
+-include .*.d
diff --git a/win32/Makefile b/win32/Makefile
index f960998..262f7a1 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -99,4 +99,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 00e89cf..04837ca 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 fe60793..9f2c8a1 100644
--- a/win64/Makefile
+++ b/win64/Makefile
@@ -89,4 +89,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 5b975be..120d4c9 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


More information about the Syslinux-commits mailing list