[Subtrick-cvs] TiTan/src/boot Makefile,1.4,1.5

[<ji...@us...>]

Update of /cvsroot/subtrick/TiTan/src/boot
In directory usw-pr-cvs1:/tmp/cvs-serv14769

Modified Files:
	Makefile 
Log Message:
Now supports layered make for kernel init dir

Index: Makefile
===================================================================
RCS file: /cvsroot/subtrick/TiTan/src/boot/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	28 Jul 2002 13:16:03 -0000	1.4
--- Makefile	25 Aug 2002 15:40:09 -0000	1.5
***************
*** 6,37 ****
  
  
! ASM   = nasm
  
! BIN    = ploader.o sloader.o kernelinit.o
! SSTAGE = sloader.o kernelinit.o
! PIMAGE = PartImage
! BIMAGE = BootImage
! CAT    = cat
  
! all: ploader sloader kernelinit makeimages
  
  ploader: ploader.s
  	nasm -f bin ploader.asm -o ploader.o
  
! sloader: kernelinit.s
  	nasm -f bin sloader.asm -o sloader.o
  
! kernelinit: kernelinit.s
! 	nasm -f bin kernelinit.asm -o kernelinit.o
! 
  makeimages:
! 	CAT $(SSTAGE) > $(PIMAGE)
! 	cp  ploader.o   $(BIMAGE)
  
  clean:
! 	rm -f $(BIN)
  
  remove:
  	rm -f $(BIMAGE)
  	rm -f $(PIMAGE)
! 	rm -f $(BIN)
--- 6,53 ----
  
  
! ASM   		= nasm
! OBJ    		= ploader.o sloader.o 
! ROBJ		= $(KINIT_DIR)/kernelinit.o
  
! # Kernel Init dir
! KINIT_DIR       = kernelinit
! # Second stage + Kernel init Bin files
! SSTAGE		= sloader.o $(ROBJ)
! # Partition Image Sloader + Kernel init
! PIMAGE 		= PartImage
! # Boot Image primary loader
! BIMAGE 		= BootImage
  
! MAKE		= make
! CAT    		= cat
! 
! all: welcome ploader sloader kinit makeimages bye
! 
! welcome:
! 	@echo "************** Starting To Compile boot **************"
  
  ploader: ploader.s
  	nasm -f bin ploader.asm -o ploader.o
  
! sloader: 
  	nasm -f bin sloader.asm -o sloader.o
  
! kinit:
! 	@cd $(KINIT_DIR); $(MAKE)
! 	
  makeimages:
! 	@$(CAT) $(SSTAGE) > $(PIMAGE)
! 	@cp  ploader.o   $(BIMAGE)
! 
! bye:
! 	@echo "**************  Finshed Compiling boot  **************"
  
  clean:
! 	rm -f $(OBJ)
! 	@cd $(KINIT_DIR); $(MAKE) clean
  
  remove:
  	rm -f $(BIMAGE)
  	rm -f $(PIMAGE)
! 	rm -f $(OBJ)
! 	d $(KINIT_DIR); $(MAKE) clean