diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:12:25 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:12:25 -0800 |
| commit | ba3c1d66fc9f6638ea22949e71d10dc4f7e83796 (patch) | |
| tree | ed8faa89356c801de088a99c42ccb3b4ba75790e /win32 | |
| parent | 71a3d797f62b0d7560cb52e148f65fa9375965bf (diff) | |
| parent | b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (diff) | |
| download | syslinux-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>
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/ntfstest/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
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 |