josh/hos
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

moved boot.asm into kernel/boot, added kernel/boot/Makefile using new subdir.mak

Browse Source 
git-svn-id: svn://anubis/hos/trunk@20 5b3e749e-e535-0410-8002-a9bb6afbdfca
This commit is contained in:
josh 2009-06-25 21:57:50 +00:00
parent a5ca4348d9
commit d8f7e731e1
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/Makefile
View File

@ -17,6 +17,7 @@ endif
export NASM := nasm export NASM := nasm
WD := $(shell pwd) WD := $(shell pwd)
export HOS_TOPLEVEL := $(WD)
LDSCRIPT := link.ld LDSCRIPT := link.ld
KERNEL := hos KERNEL := hos
export CPPFLAGS := -I$(WD)/include export CPPFLAGS := -I$(WD)/include
@ -34,7 +35,7 @@ $(KERNEL).gz: $(KERNEL)
gzip -c $< > $@ gzip -c $< > $@
$(KERNEL): $(SUBDIRS) $(KERNEL): $(SUBDIRS)
$(LD) $(LDFLAGS) -o $@ $(SUBDIRS:%=%/%.o) $(LD) $(LDFLAGS) -o $@ $(foreach subdir,$(SUBDIRS),$(subdir)/$(subdir).o)
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS)
$(SUBDIRS): $(SUBDIRS):

2
kernel/boot/Makefile Normal file
View File

@ -0,0 +1,2 @@
include $(HOS_TOPLEVEL)/subdir.mak

0
kernel/boot.asm → kernel/boot/boot.asm
View File