diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-09 14:44:34 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-09 14:44:34 -0700 |
| commit | 087b7e9916ef15bcb6835cb505d143b98534ea7a (patch) | |
| tree | 251eae48f3169c3ddd1aa878a5ecee337ab16b73 /core/Makefile | |
| parent | 2f90b35a7292515f26f65b947a9c2f065e9f65e4 (diff) | |
| parent | 17f265f989ba4918f4e030cb6b13a98c3c9ede64 (diff) | |
| download | syslinux-087b7e9916ef15bcb6835cb505d143b98534ea7a.tar.gz | |
Merge branch 'core32' into fsc
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/core/Makefile b/core/Makefile index 2f1418c0..7b03ef6a 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) @@ -86,16 +86,9 @@ kwdhash.gen: keywords genhash.pl -DHEXDATE="$(HEXDATE)" \ -l $(@:.o=.lsr) -o $@ -MP -MD .$@.d $< -%.elf: %.o $(LIBS) syslinux.ld symbols.S - $(LD) $(LDFLAGS) -T syslinux.ld -o $*.elf.tmp $< $(LIBS) - $(OBJCOPY) -x --extract-symbol $*.elf.tmp $*.sym - $(CC) $(CFLAGS) -DSYMFILE=\"$*.sym\" -c -o $*.sym.o symbols.S - $(LD) $(LDFLAGS) -T syslinux.ld -o $*.elf.tmp $< $*.sym.o $(LIBS) - $(OBJCOPY) -x --extract-symbol $*.elf.tmp $*.sym - $(CC) $(CFLAGS) -DSYMFILE=\"$*.sym\" -c -o $*.sym.o symbols.S - $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< $*.sym.o $(LIBS) \ +%.elf: %.o $(LIBS) syslinux.ld + $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< $(LIBS) \ > $(@:.elf=.map) - -rm -f $*.elf.tmp $(OBJDUMP) -h $@ > $(@:.elf=.sec) $(PERL) lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst) |