[LinksOS CVS Commit]linksos/main Makefile,1.3,1.4 strap.asm,1.2,1.3

[<bg...@us...>]

Update of /cvsroot/linksos/linksos/main
In directory sc8-pr-cvs1:/tmp/cvs-serv2915/main

Modified Files:
	Makefile strap.asm 
Log Message:
Added line for strap.asm in Makefile


Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/main/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	28 Dec 2002 16:53:16 -0000	1.3
--- Makefile	28 Dec 2002 21:23:25 -0000	1.4
***************
*** 7,10 ****
--- 7,13 ----
  GCC = gcc
  
+ #The assembler
+ ASM = nasm
+ 
  # The linker
  LD  = ld
***************
*** 14,21 ****
  
  # The object files
! OBJS = kstdio.o main.o
  
  #Compiler parameters
  CFLAGS = -I$(INCLUDE) -Wall -O -fomit-frame-pointer -c -o
  
  ALL: $(KERNELFN)
--- 17,28 ----
  
  # The object files
! OBJS = kstdio.o main.o strap.o
  
  #Compiler parameters
  CFLAGS = -I$(INCLUDE) -Wall -O -fomit-frame-pointer -c -o
+ ASMFLAGS = -f elf
+ 
+ 
+ .SUFFIXES: .asm
  
  ALL: $(KERNELFN)
***************
*** 26,29 ****
--- 33,39 ----
  .c.o:
  	$(CC) $(CFLAGS) $@ $<
+ 
+ .asm.o: 
+ 	$(ASM) $(ASMFLAGS) $<
  
  clean:

Index: strap.asm
===================================================================
RCS file: /cvsroot/linksos/linksos/main/strap.asm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** strap.asm	22 Dec 2002 18:42:12 -0000	1.2
--- strap.asm	28 Dec 2002 21:23:25 -0000	1.3
***************
*** 19,23 ****
  [SECTION .text]
  [GLOBAL _start]
! 
  ;	this part is meant for compatibility with the standard BeFS bootloader.
  ;	the BeFS bootloader loads the kernel image at 1000h:0000h and jumps to
--- 19,23 ----
  [SECTION .text]
  [GLOBAL _start]
! 	
  ;	this part is meant for compatibility with the standard BeFS bootloader.
  ;	the BeFS bootloader loads the kernel image at 1000h:0000h and jumps to
***************
*** 299,301 ****
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;	time to link to C code now!		;;
! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\ No newline at end of file
--- 299,301 ----
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;	time to link to C code now!		;;
! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;