diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-14 11:08:15 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-14 11:08:15 +0100 |
| commit | dbf8051b468e240370e3bde630a4e6fa88a031de (patch) | |
| tree | f4c5d3ef5d79d8eac27affed07e4a9215610590c /Makefile | |
| parent | e3cc5f6c89ba9f37bf2c1edf588d0f75c1d63c57 (diff) | |
adapt buildsys
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -42,7 +42,7 @@ ASMSOURCES=$(wildcard ./asm/*.asm) #kernel object files OBJECTS=$(patsubst %.c, %.o, $(SOURCES)) ASMOBJECTS=$(patsubst %.asm, %.o, $(ASMSOURCES)) -KERNEL_ENTRY=./boot/kernel_entry.o +KERNEL_ENTRY=./boot2/kernel_entry.o # deps DEPS=$(patsubst %.c, %.d, $(SOURCES)) @@ -57,17 +57,19 @@ include Makefile.common -include $(DEPS) #master boot record -MBR=./boot0/mbr.bin +MBR=./boot1/mbr.bin $(MBR): - make -C boot0 + make -C boot1 #stage 2 bootloader -STAGE2=./boot/stage2.bin +STAGE2=./boot2/stage2.bin $(STAGE2): - make -C boot + make -C boot2 #multiprocessor binary entry -MP_BIN=./boot/mp.bin +MP_BIN=./boot2/mp.bin +$(MP_BIN): + make -C boot2 mp.bin #some fillup data (zeros) FILLUP=./data/fill.bin @@ -129,9 +131,9 @@ stick: FoolOS.img clean_release: -rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2) $(DEPS) + make -C boot1 clean + make -C boot2 clean make -C userspace clean - make -C boot0 clean - make -C boot clean clean: clean_release -rm FoolOS.img FoolOS.vdi |