diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | devices/Makefile | 4 | ||||
| -rw-r--r-- | i686/Makefile | 4 | ||||
| -rw-r--r-- | src/Makefile | 11 |
4 files changed, 18 insertions, 13 deletions
@@ -46,18 +46,6 @@ Makefile.config: .config @echo -e '\n# toolchain.mk' >> Makefile.config @cat $$(sed -nE "s/CONFIG_ARCH_(.+)=y/\1/p" .config)/toolchain.mk >> Makefile.config -symlinks: - mkdir -p src/include - ln -sTf $(SRC_ROOT)/grub src/include/grub - ln -sTf $(SRC_ROOT)/${ARCH} src/include/arch - ln -sTf $(SRC_ROOT)/${ARCH}/sys src/include/sys - ln -sTf $(SRC_ROOT)/devices src/include/devices - ln -sTf $(SRC_ROOT)/lib src/include/lib - mkdir -p devices/include - ln -sTf $(SRC_ROOT)/${ARCH}/sys devices/include/sys - mkdir -p i686/include - ln -sTf $(SRC_ROOT)/grub i686/include/grub - lib/libk.a: FORCE @${MAKE} -C lib libk.a i686/arch.a: FORCE diff --git a/devices/Makefile b/devices/Makefile index 3acf31c..c799df7 100644 --- a/devices/Makefile +++ b/devices/Makefile @@ -1,6 +1,10 @@ include ../Makefile.config devs.SRCS = pic_8259.c uart_16550.cpp vga.cpp i8042.c pckbd.c mouse.c +devs.OBJS = include include ../rules.mk +include: + mkdir -p $@ + ln -sTf ../../${ARCH}/sys $@/sys diff --git a/i686/Makefile b/i686/Makefile index 9d7f06c..6bbc642 100644 --- a/i686/Makefile +++ b/i686/Makefile @@ -3,6 +3,10 @@ include ../Makefile.config arch.SRCS = boot.S init.s \ gdt.c lgdt.c \ lidt.c isr.c +arch.OBJS = include include ../rules.mk +include: + mkdir -p $@ + ln -sTf ../../grub $@/grub diff --git a/src/Makefile b/src/Makefile index 637f9a1..8f7c47c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,12 +1,21 @@ include ../Makefile.config kernel.SRCS := multiboot2.c mmap.c kernel.cpp mem/vmm.c -kernel.OBJS := conf.h +kernel.OBJS := include conf.h include ../rules.mk conf.h: conf.h.in + @echo ' GEN $@' @cp conf.h.in conf.h @sed -i 's/@VERSION@/$(shell git describe)/' conf.h @sed -i 's/@CC@/$(shell ${CC} --version | head -n1)/' conf.h +include: + mkdir -p $@ + ln -sTf ../../grub $@/grub + ln -sTf ../../${ARCH} $@/arch + ln -sTf ../../${ARCH}/sys $@/sys + ln -sTf ../../devices $@/devices + ln -sTf ../../lib $@/lib + |