Celina's Git — CeDOS: 6a25740ecc223c1339301ec9c1dd7aeb648b29cb

@@ -11,14 +11,14 @@ C_OBJECTS := $(patsubst %.c,$(LOCAL_BUILD)/%.c.o,$(C_SOURCES))
 S_OBJECTS := $(patsubst %.s,$(LOCAL_BUILD)/%.s.o,$(S_SOURCES))
 OBJECTS = $(S_OBJECTS) $(C_OBJECTS)
 
-DIRS := $(dir $(OBJECTS))
+DIRS := $(sort $(dir $(OBJECTS)))
 
 $(OBJECTS): | $(DIRS)
 $(DIRS):
 > $(MKDIR) $(DIRS)
 
 .PHONY: build
-build: folder $(SUBDIRS) $(GLOBAL_BUILD)/apps.o
+build: $(GLOBAL_BUILD)/apps.o
 $(GLOBAL_BUILD)/apps.o: $(OBJECTS)
 > $(LD) -T link.txt -r $^ -o $@ --oformat elf32-i386

M apps/start.c → src/apps/start.c

M kernel/core.c → src/kernel/core.c

M kernel/drivers/bios_speaker.c → src/kernel/drivers/bios_speaker.c

M kernel/drivers/console.c → src/kernel/drivers/console.c

M kernel/drivers/keyboard.c → src/kernel/drivers/keyboard.c

M kernel/drivers/ps2_keyboard.c → src/kernel/drivers/ps2_keyboard.c

M kernel/drivers/vga_console.c → src/kernel/drivers/vga_console.c

M kernel/entry.s → src/kernel/entry.s

M kernel/interrupts.c → src/kernel/interrupts.c

M kernel/main.c → src/kernel/main.c

M kernel/makefile → src/kernel/makefile

@@ -11,7 +11,7 @@ C_OBJECTS := $(patsubst %.c,$(LOCAL_BUILD)/%.c.o,$(C_SOURCES))
 S_OBJECTS := $(patsubst %.s,$(LOCAL_BUILD)/%.s.o,$(S_SOURCES))
 OBJECTS = $(S_OBJECTS) $(C_OBJECTS)
 
-DIRS := $(dir $(OBJECTS))
+DIRS := $(sort $(dir $(OBJECTS)))
 
 $(OBJECTS): | $(DIRS)
 $(DIRS):

M kernel/mm/memory.c → src/kernel/mm/memory.c

M kernel/mm/page_allocator.c → src/kernel/mm/page_allocator.c

M kernel/mm/paging.c → src/kernel/mm/paging.c

M kernel/pic.c → src/kernel/pic.c

M kernel/pit.c → src/kernel/pit.c

M kernel/sched/process.c → src/kernel/sched/process.c

M kernel/sched/sched.c → src/kernel/sched/sched.c

M kernel/sched/sched.s → src/kernel/sched/sched.s

M kernel/sched/sched_strats.c → src/kernel/sched/sched_strats.c

M kernel/sched/stack_check.c → src/kernel/sched/stack_check.c

M kernel/string.c → src/kernel/string.c

M kernel/syscall.c → src/kernel/syscall.c

M kernel/syscall.s → src/kernel/syscall.s

M makefile → makefile

@@ -3,6 +3,7 @@
 # directory definitions
 export CURRENT_DIR	:= $(shell pwd)
 export ROOT_DIR 	:= $(CURRENT_DIR)
+export SOURCE_DIR	:= $(CURRENT_DIR)/src
 export INCLUDE_DIR	:= $(CURRENT_DIR)/include
 export LOG_DIR		:= $(CURRENT_DIR)/log
 
@@ -50,21 +51,22 @@
 export CCFLAGS
 export GLOBAL_BUILD
 
-OBJECTS := $(LOCAL_BUILD)/stage1.o $(LOCAL_BUILD)/stage2.o $(LOCAL_BUILD)/kernel.o $(LOCAL_BUILD)/apps.o
-DIRS := $(dir $(OBJECTS))
+MODULES := stage1 stage2 kernel apps
+OBJECTS := $(patsubst %,$(LOCAL_BUILD)/%.o,$(MODULES))
+DIRS := $(LOCAL_BUILD)
 
-$(OBJECTS): | $(DIRS)
+$(MODULES): | $(DIRS)
 $(DIRS):
-> $(MKDIR) $(DIRS)
+> $(MKDIR) $@
 
 .PHONY: build
 build: $(GLOBAL_BUILD)/base.img $(GLOBAL_BUILD)/base.o
 
-$(GLOBAL_BUILD)/base.o: $(OBJECTS)
-> $(LD) 		$^ -r -T link.txt -Map=$(LOG_DIR)/mapfile.txt --oformat elf32-i386 -o $@
+$(GLOBAL_BUILD)/base.o: $(MODULES)
+> $(LD) 		$(OBJECTS) -r -T link.txt -Map=$(LOG_DIR)/mapfile.txt --oformat elf32-i386 -o $@
 
-$(GLOBAL_BUILD)/base.img: $(OBJECTS)
-> $(LD) 		$^ -T link.txt -Map=$(LOG_DIR)/mapfile.txt --oformat binary --nostdlib  -o $@
+$(GLOBAL_BUILD)/base.img: $(MODULES)
+> $(LD) 		$(OBJECTS) -T link.txt -Map=$(LOG_DIR)/mapfile.txt --oformat binary --nostdlib  -o $@
 
 .PHONY: logs
 logs: $(LOG_DIR)/base.sym $(LOG_DIR)/objdump.txt
@@ -77,23 +79,19 @@ > $(OBJDUMP) 	-D $< > $@
 
 .PHONY: stage1
 stage1:
-$(LOCAL_BUILD)/stage1.o:
-> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C stage1 $@
+> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C src/stage1 $(LOCAL_BUILD)/stage1.o
+
 .PHONY: stage2
-
 stage2:
-$(LOCAL_BUILD)/stage2.o:
-> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C stage2 $@
+> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C src/stage2 $(LOCAL_BUILD)/stage2.o
 
 .PHONY: kernel
 kernel:
-$(LOCAL_BUILD)/kernel.o:
-> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C kernel $@
+> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C src/kernel $(LOCAL_BUILD)/kernel.o
 
 .PHONY: apps
 apps:
-$(LOCAL_BUILD)/apps.o:
-> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C apps $@
+> $(MAKE) GLOBAL_BUILD=$(LOCAL_BUILD) -C src/apps $(LOCAL_BUILD)/apps.o
 
 .PHONY: clean
 clean:

M stage1/makefile → src/stage1/makefile

@@ -3,7 +3,7 @@
 LOCAL_BUILD = $(GLOBAL_BUILD)/stage1
 
 OBJECTS := $(GLOBAL_BUILD)/stage1.o
-DIRS := $(dir $(OBJECTS))
+DIRS := $(sort $(dir $(OBJECTS)))
 
 $(OBJECTS): | $(DIRS)
 $(DIRS):

M stage1/stage1.s → src/stage1/stage1.s

M stage2/entry.s → src/stage2/entry.s

M stage2/gdt.c → src/stage2/gdt.c

M stage2/gdt.h → src/stage2/gdt.h

M stage2/link.txt → src/stage2/link.txt

M stage2/linker.h → src/stage2/linker.h

M stage2/main.c → src/stage2/main.c

M stage2/makefile → src/stage2/makefile

@@ -11,7 +11,7 @@ C_OBJECTS := $(patsubst %.c,$(LOCAL_BUILD)/%.c.o,$(C_SOURCES))
 S_OBJECTS := $(patsubst %.s,$(LOCAL_BUILD)/%.s.o,$(S_SOURCES))
 OBJECTS = $(S_OBJECTS) $(C_OBJECTS)
 
-DIRS := $(dir $(OBJECTS))
+DIRS := $(sort $(dir $(OBJECTS)))
 
 $(OBJECTS): | $(DIRS)
 $(DIRS):

M stage2/paging.c → src/stage2/paging.c

M stage2/paging.h → src/stage2/paging.h