From 45d0c0d7256d52c15e7716499d6c0040f7f7ff48 Mon Sep 17 00:00:00 2001
From: bzt <bztemail@gmail.com>
Date: Mon, 11 Jul 2022 19:58:21 +0200
Subject: [PATCH] Added OUTDIR option

---
 OLVASSEL.md   |  2 ++
 README.md     |  2 ++
 uefi/Makefile | 43 ++++++++++++++++++++++++++++++-------------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/OLVASSEL.md b/OLVASSEL.md
index 1297495..68a537f 100644
--- a/OLVASSEL.md
+++ b/OLVASSEL.md
@@ -76,6 +76,7 @@ aztán átkonvertál .efi fájllá, pont, mint ahogy a gnu-efi is csinálja.
 | `LIBS`     | további függvénykönyvtárak, amikkel linkelni szeretnél (pl "-lm", csak statikus .a jöhet szóba)      |
 | `EXTRA`    | bármi további obj fájl, amit még hozzá szeretnél linkelni                                            |
 | `ALSO`     | további make szabályok futtatása                                                                     |
+| `OUTDIR`   | ha meg van adva, akkor ide generálja a projekted obj fájljait (alapértelmezetten nincs beállítva)    |
 | `USE_GCC`  | ha beállítod, akkor natív GNU gcc + ld + objccopy környzetet használ LLVM Clang + Lld helyett        |
 | `ARCH`     | a cél architektúra                                                                                   |
 
@@ -87,6 +88,7 @@ SRCS = $(wildcard *.c)
 CFLAGS = -pedantic -Wall -Wextra -Werror --std=c11 -O2
 LDFLAGS =
 LIBS = -lm
+OUTDIR = build/loader
 
 USE_GCC = 1
 include uefi/Makefile
diff --git a/README.md b/README.md
index 84cc197..bb7f1a6 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ GNU gcc + ld is used to create a shared object and get converted into an .efi fi
 | `LIBS`     | additional libraries you want to link with (like "-lm", only static .a libraries allowed)            |
 | `EXTRA`    | any additional object files you might want to link with                                              |
 | `ALSO`     | additional makefile rules to be called                                                               |
+| `OUTDIR`   | if given, then your project's object files are generated into this directory (by default not set)    |
 | `USE_GCC`  | set this if you want native GNU gcc + ld + objccopy instead of LLVM Clang + Lld                      |
 | `ARCH`     | the target architecture                                                                              |
 
@@ -95,6 +96,7 @@ SRCS = $(wildcard *.c)
 CFLAGS = -pedantic -Wall -Wextra -Werror --std=c11 -O2
 LDFLAGS =
 LIBS = -lm
+OUTDIR = build/loader
 
 USE_GCC = 1
 include uefi/Makefile
diff --git a/uefi/Makefile b/uefi/Makefile
index 74e7ebb..44381e3 100644
--- a/uefi/Makefile
+++ b/uefi/Makefile
@@ -8,8 +8,14 @@ endif
 ifeq ($(SRCS),)
 SRCS = $(wildcard *.c) $(wildcard *.S)
 endif
+ifeq ($(OBJS),)
 TMP = $(SRCS:.c=.o)
 OBJS = $(TMP:.S=.o)
+endif
+ifneq ($(OUTDIR),)
+# OUTDIR is not used with uefi/*.o deliberately
+OUTDIR:=$(addsuffix /,$(OUTDIR))
+endif
 CFLAGS += -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -I. -I./uefi \
   -I/usr/include -I/usr/include/efi -I/usr/include/efi/protocol -I/usr/include/efi/$(ARCH) -D__$(ARCH)__
 ifeq ($(ARCH),x86_64)
@@ -31,7 +37,7 @@ CFLAGS += -maccumulate-outgoing-args
 endif
 CFLAGS += -Wno-builtin-declaration-mismatch -fpic -fPIC
 LDFLAGS += -nostdlib -shared -Bsymbolic -Luefi uefi/crt_$(ARCH).o
-LIBS += -o $(TARGET).so -luefi -T uefi/elf_$(ARCH)_efi.lds
+LIBS += -o $(addprefix $(OUTDIR),$(TARGET).so) -luefi -T uefi/elf_$(ARCH)_efi.lds
 # see if we're cross-compiling
 ifneq ($(ARCH),$(MYARCH))
 CC = $(ARCH)-elf-gcc
@@ -51,7 +57,7 @@ AR ?= ar
 else
 CFLAGS += --target=$(ARCH)-pc-win32-coff -Wno-builtin-requires-header -Wno-incompatible-library-redeclaration -Wno-long-long
 LDFLAGS += -subsystem:efi_application -nodefaultlib -dll -entry:uefi_init uefi/*.o
-LIBS = -out:$(TARGET)
+LIBS = -out:$(addprefix $(OUTDIR),$(TARGET))
 CC = clang
 LD = lld -flavor link
 OBJCOPY = true
@@ -59,12 +65,17 @@ endif
 
 # recipies
 ifeq ($(wildcard uefi/Makefile),)
-ALLTARGETS = crt_$(ARCH).o libuefi.a build
+ALLTARGETS = crt_$(ARCH).o libuefi.a buildlib
 else
 ALLTARGETS = uefi/crt_$(ARCH).o uefi/libuefi.a $(OBJS) $(TARGET)
 endif
 
-all: $(ALLTARGETS) $(EXTRA) $(ALSO)
+all: $(OUTDIR) $(ALLTARGETS) $(EXTRA) $(ALSO)
+
+ifneq ($(OUTDIR),)
+$(OUTDIR):
+	@mkdir -p $(OUTDIR)
+endif
 
 uefi/libuefi.a:
 	@make --no-print-directory -C uefi libuefi.a USE_GCC=$(USE_GCC) ARCH=$(ARCH)
@@ -79,30 +90,36 @@ else
 	@true
 endif
 
-$(TARGET): $(TARGET).so
+$(TARGET): $(addprefix $(OUTDIR),$(TARGET).so)
 ifneq ($(USE_GCC),)
-	@$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym  -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc --target $(EFIARCH) --subsystem=10 $^ $@ || echo target: $(EFIARCH)
-	@rm $(TARGET).so
+	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym  -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc --target $(EFIARCH) --subsystem=10 $^ $(addprefix $(OUTDIR),$@) || echo target: $(EFIARCH)
+	@rm $(addprefix $(OUTDIR),$(TARGET).so)
 endif
 
-$(TARGET).so: $(OBJS) $(EXTRA)
+$(addprefix $(OUTDIR),$(TARGET).so): $(addprefix $(OUTDIR),$(OBJS)) $(EXTRA)
 	$(LD) $(LDFLAGS) $^ $(LIBS)
-	@rm *.lib 2>/dev/null || true
+	@rm $(addprefix $(OUTDIR),*.lib) 2>/dev/null || true
 
-%.o: %.c
+uefi/%.o: uefi/%.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $(addprefix $(OUTDIR),$@)
+
 %.o: %.S
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -c $< -o $(addprefix $(OUTDIR),$@)
 
-build:
+buildlib:
 	@mkdir ../build ../build/uefi 2>/dev/null || true
 	@cp crt_$(ARCH).o ../build/uefi/crt0.o
 	@cp elf_$(ARCH)_efi.lds ../build/uefi/link.ld
 	@cp libuefi.a uefi.h ../build/uefi
 
 clean:
-	@rm $(TARGET) *.o *.a *.lib *.elf $(LIBOBJS) 2>/dev/null || true
+	@rm $(addprefix $(OUTDIR),$(TARGET)) *.o *.a *.lib *.elf $(LIBOBJS) 2>/dev/null || true
+ifneq ($(OUTDIR),)
+	@rm -rf $(OUTDIR)
+endif
 
 distclean: clean
 ifeq ($(wildcard uefi/Makefile),)