improving build system

2 files changed, 23 insertions, 7 deletions

diff --git a/boot/Makefile b/boot/Makefile
new file mode 100644
index 0000000..17dc454
--- /dev/null
+++ b/boot/Makefile
@@ -0,0 +1,16 @@
+#master boot record
+
+include ../Makefile.common
+
+STAGE2=stage2.bin
+
+ASM_SOURCES=$(wildcard *.asm)
+
+$(STAGE2): $(ASM_SOURCES)
+
+clean: 
+	-rm $(STAGE2)
+
+
+
+
diff --git a/boot/stage2.asm b/boot/stage2.asm
index 6ac0fd1..0a3ee87 100644
--- a/boot/stage2.asm
+++ b/boot/stage2.asm
@@ -73,25 +73,25 @@ STR_PM:
 ;
 ;;lets put our temporary GDT (Global Descriptor Table) here
 ;;kernel should move this away
-%include "boot/GDT.asm"
+%include "GDT.asm"
 ;
 ;;include 16-bit real mode routines (print_string, disk_load, vesa_setup,check_a20)
-%include "boot/disk_load_16.asm"
+%include "disk_load_16.asm"
 ;%include "boot/check_a20_16.asm"
-%include "boot/print_string_16.asm"
-%include "boot/vesa_setup_16.asm"
+%include "print_string_16.asm"
+%include "vesa_setup_16.asm"
 ;
 ;;include our routines for switching to 32-bit protected mode
-%include "boot/pm.asm"
+%include "pm.asm"
 
 ;include some pm mode helpers
-%include "boot/common_pm.asm"
+%include "common_pm.asm"
 
 ;
 ;
 ;
 ;;get memory map routine
-%include "boot/memmap.asm"
+%include "memmap.asm"
 ;
 ;;;;;;;;; BOOT 16-bit real ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;