[LinksOS CVS Commit]linksos Makefile,1.3,1.4 machine.mk,1.2,1.3

[<ke...@to...>]

Update of /cvsroot/linksos/linksos
In directory router-internal.tossell.net:/tmp/cvs-serv21406

Modified Files:
	Makefile machine.mk 
Log Message:
Title: Multiboot 
Changes: Added multiboot code (bgm's). Fixed makefiles (they need more work) - changed to GNU as, added more to main.c (notices and multiboot checks)

Effects: You can boot from GRUB!

a=kennyt


Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	3 Jan 2003 21:47:38 -0000	1.3
--- Makefile	3 Jan 2003 22:32:10 -0000	1.4
***************
*** 6,8 ****
  	cd hal && make hal
  	cd boot && make boot
! 	$(LD)  -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -T main/kernel.ls
--- 6,9 ----
  	cd hal && make hal
  	cd boot && make boot
! 	cd main && make main
! 	$(LD)  -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -Ttext 0x100000

Index: machine.mk
===================================================================
RCS file: /cvsroot/linksos/linksos/machine.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** machine.mk	3 Jan 2003 21:47:38 -0000	1.2
--- machine.mk	3 Jan 2003 22:32:10 -0000	1.3
***************
*** 1,4 ****
  LD=ld
  GCC=gcc
! ASM=nasm
  ARCH=x86
--- 1,4 ----
  LD=ld
  GCC=gcc
! ASM=as
  ARCH=x86