From 643f932bcdc8d35ffd0e50d1291f4f895de76fac Mon Sep 17 00:00:00 2001
From: Johannes Stoelp <johannes.stoelp@gmail.com>
Date: Sat, 11 Dec 2021 20:55:48 +0100
Subject: guest: merge make rules

---
 guest/Makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/guest/Makefile b/guest/Makefile
index a2eea1b..635759a 100644
--- a/guest/Makefile
+++ b/guest/Makefile
@@ -1,17 +1,14 @@
+ARCH16 := i8086
+ARCH64 := i386:x86-64
+
 guest: guest16 guest64
 disasm: disasm16 disasm64
 
-guest16: guest.ld guest16.S
-	$(CC) $(CFLAGS) -m16 -o $@ -nostdlib -ffreestanding -Wpedantic -Wall -Wextra -Werror -T guest.ld guest16.S
-
-guest64: guest.ld guest64.S
-	$(CC) $(CFLAGS) -m64 -o $@ -nostdlib -fPIC -ffreestanding -Wpedantic -Wall -Wextra -Werror -T guest.ld guest64.S
-
-disasm16: guest16
-	objdump -D -b binary -m i8086 -M intel $^
+guest%: guest.ld guest%.S
+	$(CC) $(CFLAGS) -m$* -o $@ -nostdlib -ffreestanding -Wpedantic -Wall -Wextra -Werror -T guest.ld guest$*.S
 
-disasm64: guest64
-	objdump -D -b binary -m i386:x86-64 -M intel $^
+disasm%: guest%
+	objdump -D -b binary -m $(ARCH$*) -M intel $^
 
 clean:
 	$(RM) guest16 guest64
-- 
cgit v1.2.3