From 6911434dc4b98d5939caf3aad5fafdf369f56a55 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Mon, 21 Apr 2025 21:57:16 -0400
Subject: make somce changes to procs

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b87410f..c3643a9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ UNAME := $(shell uname)
 QEMU = qemu-system-x86_64
 QEMUOPTS = -cdrom $(BIN)/$(ISO) \
 		   -no-reboot \
-		   -drive format=raw,file=$(BIN)/$(IMAGE)\
+		   -drive format=raw,file=$(BIN)/user/hello\
 		   -serial mon:stdio \
 		   -m 4G \
 		   -name kern
-- 
cgit v1.2.3-freya


From 5d081066293bf97707cb1bdd2a714900839940f4 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Mon, 21 Apr 2025 21:59:08 -0400
Subject: fix makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c3643a9..b87410f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ UNAME := $(shell uname)
 QEMU = qemu-system-x86_64
 QEMUOPTS = -cdrom $(BIN)/$(ISO) \
 		   -no-reboot \
-		   -drive format=raw,file=$(BIN)/user/hello\
+		   -drive format=raw,file=$(BIN)/$(IMAGE)\
 		   -serial mon:stdio \
 		   -m 4G \
 		   -name kern
-- 
cgit v1.2.3-freya


From e6d4c51dd78a6a566f70c6fcbcc89e9350603a73 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Tue, 22 Apr 2025 13:17:27 -0400
Subject: build user code in main make

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b87410f..6eb1140 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ $(BIN)/$(ISO): $(BIN)/$(KERNEL)
 	$(GRUB) -o $(BIN)/$(ISO) bin/iso 2>/dev/null
 
 $(BIN)/$(IMAGE):
+	make -s -C user
 	qemu-img create $(BIN)/$(IMAGE) $(IMAGE_SIZE)
 
 fmt:
-- 
cgit v1.2.3-freya


From 920aeb28996c8a404316f1304ee3f46511fb7b1a Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Tue, 22 Apr 2025 13:21:25 -0400
Subject: force rebuild on header change

---
 Makefile      | 4 ++--
 user/Makefile | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6eb1140..bb015aa 100644
--- a/Makefile
+++ b/Makefile
@@ -78,13 +78,13 @@ clean:
 
 build: $(BIN)/$(ISO)
 
-$(A_OBJ): $(BIN)/%.S.o : %.S
+$(A_OBJ): $(BIN)/%.S.o : %.S $(H_SRC)
 	mkdir -p $(@D)
 	printf "\033[33m  AS  \033[0m%s\n" $<
 	$(CPP) $(CPPFLAGS) -o $@.cpp $<
 	$(AS) -o $@ $@.cpp
 
-$(C_OBJ): $(BIN)/%.o : %.c
+$(C_OBJ): $(BIN)/%.o : %.c $(H_SRC)
 	mkdir -p $(@D)
 	printf "\033[34m  CC  \033[0m%s\n" $<
 	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/user/Makefile b/user/Makefile
index 5233808..a01d950 100644
--- a/user/Makefile
+++ b/user/Makefile
@@ -41,13 +41,13 @@ build: $(USER_PROJ)
 clean:
 	rm -fr $(BIN)
 
-$(LIBA_OBJ): $(BIN)/%.S.o : %.S
+$(LIBA_OBJ): $(BIN)/%.S.o : %.S $(H_SRC)
 	mkdir -p $(@D)
 	printf "\033[33m  AS  \033[0m%s\n" user/$<
 	$(CPP) $(CPPFLAGS) -o $@.cpp $<
 	$(AS) -o $@ $@.cpp
 
-$(LIBC_OBJ): $(BIN)/%.o : %.c
+$(LIBC_OBJ): $(BIN)/%.o : %.c $(H_SRC)
 	mkdir -p $(@D)
 	printf "\033[34m  CC  \033[0m%s\n" user/$<
 	$(CC) -c $(CFLAGS) -o $@ $<
@@ -57,7 +57,7 @@ $(BIN)/libc.a: $(LIBA_OBJ) $(LIBC_OBJ)
 	printf "\033[35m  AR  \033[0m%s\n" $(shell echo $@ | cut -c 4-)
 	$(AR) rcs $@ $(LIBA_OBJ) $(LIBC_OBJ)
 
-$(USER_OBJ): $(BIN)/%.o : %.c
+$(USER_OBJ): $(BIN)/%.o : %.c $(H_SRC)
 	mkdir -p $(@D)
 	printf "\033[34m  CC  \033[0m%s\n" user/$<
 	$(CC) -c $(CFLAGS) -o $@ $<
-- 
cgit v1.2.3-freya