diff options
author | Andreas Kling <awesomekling@gmail.com> | 2018-10-17 10:55:43 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2018-10-17 10:57:23 +0200 |
commit | 9171521752b0b382f1f70453b4f24915999144b9 (patch) | |
tree | a3bb1e3533e591c4693ce98b245870e4da5daede /Kernel/Makefile | |
parent | aec8ab0a606a1ccb3eaf5816ef85e3951c2d5227 (diff) | |
download | serenity-9171521752b0b382f1f70453b4f24915999144b9.zip |
Integrate ext2 from VFS into Kernel.
Diffstat (limited to 'Kernel/Makefile')
-rw-r--r-- | Kernel/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile index 93a28f5515..330b658214 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -14,10 +14,8 @@ KERNEL_OBJS = \ PIC.o \ Syscall.o \ DataBuffer.o \ - String.o \ panel.o \ Disk.o \ - fs.o \ Userspace.o \ IDEDiskDevice.o @@ -27,9 +25,16 @@ VFS_OBJS = \ ../VirtualFileSystem/NullDevice.o \ ../VirtualFileSystem/FullDevice.o \ ../VirtualFileSystem/ZeroDevice.o \ - ../VirtualFileSystem/RandomDevice.o + ../VirtualFileSystem/RandomDevice.o \ + ../VirtualFileSystem/FileSystem.o \ + ../VirtualFileSystem/DiskBackedFileSystem.o \ + ../VirtualFileSystem/Ext2FileSystem.o -OBJS = $(KERNEL_OBJS) $(VFS_OBJS) +AK_OBJS = \ + ../AK/String.o \ + ../AK/StringImpl.o + +OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS) NASM = nasm KERNEL = kernel |