diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:11:39 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:11:39 -0800 |
| commit | b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (patch) | |
| tree | 1dadca813cdf5fd8d78494d9342237badac5dc96 | |
| parent | f77bb1d32dd96036661fc4f62045dcb04414056b (diff) | |
| parent | 374a37434fa11bdc95e0bc243aadb7de36bbbf43 (diff) | |
| download | syslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.tar.gz | |
Merge remote-tracking branch 'origin/syslinux-4.xx' into syslinux-5.xx
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | dos/Makefile | 2 | ||||
| -rw-r--r-- | extlinux/Makefile | 2 | ||||
| -rw-r--r-- | linux/Makefile | 2 | ||||
| -rw-r--r-- | memdump/Makefile | 2 | ||||
| -rwxr-xr-x | mtools/Makefile | 2 | ||||
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/ntfstest/Makefile | 2 | ||||
| -rw-r--r-- | win64/Makefile | 2 | ||||
| -rw-r--r-- | 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 f20a71db..e33bd689 100644 --- a/extlinux/Makefile +++ b/extlinux/Makefile @@ -66,4 +66,4 @@ strip: %.s: %.c $(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $< --include .*.d *.tmp +-include .*.d diff --git a/linux/Makefile b/linux/Makefile index d7facaf4..25d3201e 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -68,4 +68,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 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 diff --git a/win32/Makefile b/win32/Makefile index 9ff8a453..b54e4d64 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -100,4 +100,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 50132d48..f0452dbf 100644 --- a/win64/Makefile +++ b/win64/Makefile @@ -90,4 +90,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 |