From ef4c73ac58f4aae29e47b680808570e2203b9713 Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.org>
Date: Sun, 19 Oct 2025 21:20:37 -0500
Subject: build: align all build files

Align all the build makefiles so that the standard template is used
OS-wide. Remove all the dangling files leftover from
pre-standardization.

Signed-off-by: Danny Holman <dholman@gymli.org>
---
 bootstrap/Makefile        | 4 +---
 bootstrap/TODO            | 3 +++
 bootstrap/stage1/Makefile | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 bootstrap/TODO

(limited to 'bootstrap')

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index 665a26d..f65f800 100644
--- a/bootstrap/Makefile
+++ b/bootstrap/Makefile
@@ -15,14 +15,12 @@
 # You should have received a copy of the GNU General Public License along with
 # BoxOS; if not, see <https://www.gnu.org/licenses/>.
 
-include $(ROOTDIR)/build.conf
-
 ifeq ($(BS_DEBUG),YES)
 	AFLAGS+=-g
 	CFLAGS+=-g
 endif
 
-export VERSION ROOTDIR DESTDIR AFLAGS CFLAGS
+export AFLAGS CFLAGS
 
 SUBDIRS:=stage1 \
 	 stage2 \
diff --git a/bootstrap/TODO b/bootstrap/TODO
new file mode 100644
index 0000000..0347757
--- /dev/null
+++ b/bootstrap/TODO
@@ -0,0 +1,3 @@
+* Make a common include directory for headers common to both stages
+* Optimize the UEFI version of stage1
+* Overall decluttering and reformatting
diff --git a/bootstrap/stage1/Makefile b/bootstrap/stage1/Makefile
index b80a16b..3cf7437 100644
--- a/bootstrap/stage1/Makefile
+++ b/bootstrap/stage1/Makefile
@@ -45,6 +45,7 @@ all: $(BINARY)
 
 $(BINARY): $(OBJS)
 	@$(LD) $(LDFLAGS) $^
+	@echo [LD] $@
 
 %.o: %.c
 	@$(CC) -MD -c $< -o $@ $(CFLAGS) $(INCLUDE)
-- 
cgit v1.2.3