diff options
| -rw-r--r-- | efi.mk | 4 | ||||
| -rw-r--r-- | kernel/Makefile | 2 | ||||
| -rw-r--r-- | lib/memcmp.c (renamed from kernel/memcmp.c) | 0 | ||||
| -rw-r--r-- | lib/memcpy.c (renamed from kernel/memcpy.c) | 0 | ||||
| -rw-r--r-- | lib/memmove.c (renamed from kernel/memmove.c) | 0 | ||||
| -rw-r--r-- | lib/memset.c (renamed from kernel/memset.c) | 0 | ||||
| -rw-r--r-- | loader/Makefile | 4 | ||||
| -rw-r--r-- | rules.mk | 6 |
8 files changed, 10 insertions, 6 deletions
@@ -40,7 +40,7 @@ LINK._efi.so = $(LD) $(LDFLAGS) -znocombreloc -Bsymbolic -shared --no-undefined %.efi: %_efi.so $(OBJCOPY.info) - $(OBJCOPY.efi) + @$(OBJCOPY.efi) %.debug.efi: %_efi.so $(OBJCOPY.info) @@ -48,5 +48,5 @@ LINK._efi.so = $(LD) $(LDFLAGS) -znocombreloc -Bsymbolic -shared --no-undefined %_efi.so: $(EFILDSCRIPT) $(EFICRT) $(LINK.info) - $(LINK._efi.so) + @$(LINK._efi.so) diff --git a/kernel/Makefile b/kernel/Makefile index b51532e..7835041 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,5 +1,7 @@ include ../defaults.mk +VPATH := ../lib + TARGET := kernel.os .DEFAULT: $(TARGET) diff --git a/kernel/memcmp.c b/lib/memcmp.c index 2348afe..2348afe 100644 --- a/kernel/memcmp.c +++ b/lib/memcmp.c diff --git a/kernel/memcpy.c b/lib/memcpy.c index 58b1e40..58b1e40 100644 --- a/kernel/memcpy.c +++ b/lib/memcpy.c diff --git a/kernel/memmove.c b/lib/memmove.c index fd06bb6..fd06bb6 100644 --- a/kernel/memmove.c +++ b/lib/memmove.c diff --git a/kernel/memset.c b/lib/memset.c index 3e7025e..3e7025e 100644 --- a/kernel/memset.c +++ b/lib/memset.c diff --git a/loader/Makefile b/loader/Makefile index 2e849dc..582daf3 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -1,6 +1,8 @@ include ../defaults.mk include ../efi.mk +VPATH := ../lib + IMAGE := loader.efi BUILD := $(IMAGE) $(IMAGE:.efi=.debug.efi) @@ -8,7 +10,7 @@ CPPFLAGS += -I../api all: $(BUILD) -OBJS := entry_efi.o loader_efi.o memory_efi.o +OBJS := entry_efi.o loader_efi.o memory_efi.o memcmp.o memmove.o DEPS := $(OBJS:.o=.d) IMAGE_SO := $(IMAGE:.efi=_efi.so) @@ -19,15 +19,15 @@ COMPILE.info = $(info $$(CC) $@) %.debug.os: %.os $(OBJCOPY) --only-keep-debug $< $@ - $(OBJCOPY) --strip-debug $< + @$(OBJCOPY) --strip-debug $< %.o: %.c $(COMPILE.info) - $(COMPILE.c) -MMD -MP + @$(COMPILE.c) -MMD -MP %.o: %.cpp $(COMPILE.info) - $(COMPILE.cpp) -MMD -MP + @$(COMPILE.cpp) -MMD -MP clean: $(info $$(RM) $(CLEANLIST)) |