summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <[email protected]>2011-09-04 15:19:43 -0400
committerAustin Clements <[email protected]>2011-09-04 15:19:43 -0400
commit68b58727166bbb339f4790ec779a5a16772557f6 (patch)
treefab703953ea39da74b0e6a74ac1f0ce4ac97b28a
parente33873067b805f89a22b74a6295c18edc7dd6f30 (diff)
downloadxv6-labs-68b58727166bbb339f4790ec779a5a16772557f6.tar.gz
xv6-labs-68b58727166bbb339f4790ec779a5a16772557f6.tar.bz2
xv6-labs-68b58727166bbb339f4790ec779a5a16772557f6.zip
kernel depends on kernel.ld
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b13ab4d..3ce1cb4 100644
--- a/Makefile
+++ b/Makefile
@@ -109,8 +109,8 @@ initcode: initcode.S
$(OBJCOPY) -S -O binary initcode.out initcode
$(OBJDUMP) -S initcode.o > initcode.asm
-kernel: $(OBJS) entry.o entryother initcode
- $(LD) $(LDFLAGS) -T kernel.ld -e entry -o kernel entry.o $(OBJS) -b binary initcode entryother
+kernel: $(OBJS) entry.o entryother initcode kernel.ld
+ $(LD) $(LDFLAGS) -T kernel.ld -o kernel entry.o $(OBJS) -b binary initcode entryother
$(OBJDUMP) -S kernel > kernel.asm
$(OBJDUMP) -t kernel | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernel.sym