diff options
| author | Loic Guegan <manzerbredes@mailbox.org> | 2021-04-24 10:09:43 +0200 |
|---|---|---|
| committer | Loic Guegan <manzerbredes@mailbox.org> | 2021-04-24 10:09:43 +0200 |
| commit | 657372f1be95393b76a54f258ba3f937b4073abe (patch) | |
| tree | 18aa2cb9b7f3e4d38a5208d9db2811f6af46fa61 /src/Makefile | |
| parent | 99019721a9e147c49becc466c5427609b937aca8 (diff) | |
New paging manager and multiboot2 tools
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 2fe67a6..6e6b5c2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,14 +5,15 @@ LD_SCRIPT := linker.ld # Note that BOOT_OBJ do not match boot.S # Indeed boot.o generated by boot.S should appear # first in the kernel binary (thus it must be linked first, cf the $(EXEC) rule) -BOOT_OBJ := $(addsuffix .cc,$(basename $(shell find ./boot -name '*.cc' -name '*.S' ! -name "boot.S"))) +BOOT_OBJ := $(addsuffix .o,$(basename $(shell find ./boot -name '*.cc' -o -name '*.S' ! -name "boot.S"))) DRIVERS_OBJ := $(addsuffix .o,$(basename $(shell find ./drivers -name '*.cc' -o -name '*.S'))) -LIBS_OBJ := $(addsuffix .cc,$(basename $(shell find ./libs -name '*.cc' -o -name '*.S'))) +LIBS_OBJ := $(addsuffix .o,$(basename $(shell find ./libs -name '*.cc' -o -name '*.S'))) CORE_OBJ := $(addsuffix .o,$(basename $(shell find ./core -name '*.cc' -o -name '*.S'))) all: $(EXEC) $(EXEC): boot/boot.o $(BOOT_OBJ) $(DRIVERS_OBJ) $(LIBS_OBJ) $(CORE_OBJ) boucane.o + echo $(BOOT_OBJ) $(CC) -n -T $(LD_SCRIPT) -nostdlib -o $@ $^ %.o: %.S |