From 80c0c5f04a1d822409ecaa19ef390ec29bd15151 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Fri, 17 Jan 2014 14:25:34 -0800
Subject: version: Update to 4.08, update year to 2014

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index 94249a5e..98f5a4cc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-4.07 2013
+4.08 2014
-- 
cgit v1.2.1


From 374a37434fa11bdc95e0bc243aadb7de36bbbf43 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sat, 18 Jan 2014 16:09:19 -0800
Subject: 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@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 f9420084..afb279dc 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 6cde574e..2c552f97 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 08a3ed49..9352f0cf 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 6a30431a..a327e830 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 78cea1e2..61e19f71 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 f960998a..262f7a1a 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 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 fe60793c..9f2c8a16 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 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
-- 
cgit v1.2.1