diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-09 14:44:16 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-09 14:44:16 -0700 |
| commit | 8b0f75f79811a30cd3f8460e305c6eea82f288a0 (patch) | |
| tree | 14ce4a69e41096457ad017a7f3df5364bf508d68 | |
| parent | 1ae7b3adf549f463d3eb4fe98015795c8854f167 (diff) | |
| parent | 17f265f989ba4918f4e030cb6b13a98c3c9ede64 (diff) | |
| download | syslinux-8b0f75f79811a30cd3f8460e305c6eea82f288a0.tar.gz | |
Merge branch 'core32' into dynamic
Resolved Conflicts:
core/Makefile
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 8bcbca5a..1a5204ec 100644 --- a/core/Makefile +++ b/core/Makefile @@ -41,7 +41,7 @@ BTARGET = kwdhash.gen \ NASMSRC := $(wildcard *.asm) NASMHDR := $(wildcard *.inc) CSRC := $(wildcard *.c) -SSRC := $(filter-out symbols.S,$(wildcard *.S lzo/*.S)) +SSRC := $(wildcard *.S lzo/*.S) CHDR := $(wildcard *.h) OTHERSRC := keywords ALLSRC = $(NASMSRC) $(NASMHDR) $(CSRC) $(SSRC) $(CHDR) $(OTHERSRC) |