diff options
| author | Miguel <m.i@gmx.at> | 2018-09-12 16:04:15 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-12 16:04:15 +0200 |
| commit | bcd07d2b3161364fbffa42d0d9752a1f6581b713 (patch) | |
| tree | 47b8ef39c5c3962cd849493737adb3a8c5b095c3 /Makefile | |
| parent | c72944b5646863ffaaaff94dc03b939a08566203 (diff) | |
added support for .S
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -89,9 +89,17 @@ DEPS=$(patsubst %.c, %.d, $(SOURCES)) ASM_SOURCES=$(wildcard ./asm/*.asm) ASM_OBJECTS=$(patsubst %.asm, %.o, $(ASM_SOURCES)) + ASM_MULTIBOOT=$(wildcard ./asm/*.s) ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT)) +ASM_MULTIBOOT2=$(wildcard ./asm/*.S) +ASM_MULTIBOOT_OBJ2=$(patsubst %.S, %.o, $(ASM_MULTIBOOT2)) + +ASM_OBJECTS+=$(ASM_MULTIBOOT_OBJ) +ASM_OBJECTS+=$(ASM_MULTIBOOT_OBJ2) + + #### BINARIES AND SUBMODULES ######## FOOLOS_ISO=FoolOS.iso @@ -136,7 +144,8 @@ $(CLEANDIRS): ############ linking kernel binary ############ -$(KERNEL_IMG): $(ASM_MULTIBOOT_OBJ) $(ASM_OBJECTS) $(OBJECTS) +$(KERNEL_IMG): $(ASM_OBJECTS) $(OBJECTS) + @echo "linking kernel..." $(CC) $(CFLAGS) $(LDFLAGS) -T linker.ld -o $@ $^ $(LDLIBS) ############ assembling of final image ############ @@ -196,7 +205,7 @@ stop-qemu: ############ cleanup ############ clean: $(CLEANDIRS) - @echo "Cleaning..."; rm -f *.bin $(FOOLOS) $(FOOLOS_ISO) $(FOOLOS_VDI) $(KERNEL_ENTRY) $(ASM_MULTIBOOT_OBJ) $(KERNEL_IMG) $(ASM_OBJECTS) $(OBJECTS) $(IMG_FILLUP) $(BIN_MBR) $(BIN_MP) $(BIN_STAGE2) $(DEPS) bochs.out bochs.log ne2k-tx.log ne2k-txdump.txt tags grubiso/boot/foolos.bin grubiso/boot/ext2.img + @echo "Cleaning..."; rm -f *.bin $(FOOLOS) $(FOOLOS_ISO) $(FOOLOS_VDI) $(KERNEL_ENTRY) $(KERNEL_IMG) $(ASM_OBJECTS) $(OBJECTS) $(IMG_FILLUP) $(BIN_MBR) $(BIN_MP) $(BIN_STAGE2) $(DEPS) bochs.out bochs.log ne2k-tx.log ne2k-txdump.txt tags grubiso/boot/foolos.bin grubiso/boot/ext2.img @echo "Cleaning Documentation..."; rm -f ./doc/ -r tags: |