Full restructure

1 files changed, 5 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 1554030..19bca78 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ assembly_source_files := $(wildcard arch/$(arch)/boot/*.asm)
 assembly_object_files := $(patsubst arch/$(arch)/boot/%.asm, \
 	build/arch/$(arch)/%.o, $(assembly_source_files))
 
-dats_source_files := $(wildcard kernel/*.dats kernel/**/*.dats)
-dats_object_files := $(patsubst kernel/%.dats, \
-	build/kernel/%_dats.o, $(dats_source_files))
+dats_source_files := $(wildcard lib/**/*.dats kernel/*.dats kernel/**/*.dats kernel/**/**/*.dats)
+dats_object_files := $(patsubst %.dats, \
+	build/%_dats.o, $(dats_source_files))
 
 PATSCC=acc pc
 
@@ -51,11 +51,11 @@ build/arch/$(arch)/%.o: arch/$(arch)/boot/%.asm
 	@mkdir -p $(shell dirname $@)
 	@nasm -felf64 $< -o $@
 
-build/kernel/%_dats.c: kernel/%.dats
+build/%_dats.c: %.dats
 	@mkdir -p $(shell dirname $@)
 	$(PATSCC) -ccats -o $@ $<
 	@mv *_dats.c $@
 
-build/kernel/%.o:	build/kernel/%.c 
+build/%.o:	build/%.c 
 	@mkdir -p $(shell dirname $@)
 	$(CC) $(INCLUDE_ATS) $(CFLAGS) $(CFLAGS_ATS) -O2 -c $< -o $@