diff options
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 |