summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorDanny Holman <dholman@gymli.org>2025-10-19 21:20:37 -0500
committerDanny Holman <dholman@gymli.org>2025-10-19 21:20:37 -0500
commitef4c73ac58f4aae29e47b680808570e2203b9713 (patch)
tree8644bb01e53bb03d9ab8562cff0778fbabbedb40 /bootstrap
parentbootstrap: stage2: create build files (diff)
downloadbox-ef4c73ac58f4aae29e47b680808570e2203b9713.tar.gz
box-ef4c73ac58f4aae29e47b680808570e2203b9713.tar.zst
box-ef4c73ac58f4aae29e47b680808570e2203b9713.zip
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>
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/Makefile4
-rw-r--r--bootstrap/TODO3
-rw-r--r--bootstrap/stage1/Makefile1
3 files changed, 5 insertions, 3 deletions
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)