[LinksOS CVS Commit]linksos/main include.mk,NONE,1.1 Makefile,1.4,1.5 main.c,1.2,1.3

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

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

Modified Files:
	Makefile main.c 
Added Files:
	include.mk 
Log Message:
Title: More build system 
Changes: added root makefile and machine definition file;  main makefile. added boot/ makefiles and the main/ include def file. (this should be globalized.) Changed main.c to include using the predefined path.

Effects: It builds (yes, it is the old code and it might not even be the right format, so what?)

a=kennyt


--- NEW FILE: include.mk ---
INCDIRS += $(TOPDIR)/hal/prototypes
Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/main/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	28 Dec 2002 21:23:25 -0000	1.4
--- Makefile	3 Jan 2003 21:47:38 -0000	1.5
***************
*** 1,42 ****
! #No comment 
! 
! # Programs to delete and copy files with
! RM = rm -f
! 
! # The C compiler
! GCC = gcc
! 
! #The assembler
! ASM = nasm
! 
! # The linker
! LD  = ld
! 
! # The kernel filename
! KERNELFN = kernel.bin
! 
! # 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)
! 
! $(KERNELFN): $(OBJS)
! 	$(LD)  -Bstatic -o $(KERNELFN) $(OBJS) -Map kernel.map -T kernel.ls
  
  .c.o:
! 	$(CC) $(CFLAGS) $@ $<
! 
! .asm.o: 
! 	$(ASM) $(ASMFLAGS) $<
! 
! clean:
! 	$(RM) $(KERNELFN) *~ kernel.map *.o 
! 
  
--- 1,17 ----
! TOPDIR = ../
  
! include $(TOPDIR)/machine.mk
! include include.mk
  
+ CFLAGS = -I$(INCDIRS) -Wall -O -fomit-frame-pointer -c -o
  
  .SUFFIXES: .asm
  
! boot: main.o
! 	ld -r -o boot.o $<
  
  .c.o:
! 	$(GCC) $(CFLAGS) $@ $<
  
+ .asm.o:
+ 	$(ASM) -f elf $<
\ No newline at end of file

Index: main.c
===================================================================
RCS file: /cvsroot/linksos/linksos/main/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c	28 Dec 2002 16:53:16 -0000	1.2
--- main.c	3 Jan 2003 21:47:38 -0000	1.3
***************
*** 12,16 ****
  \****************************************************************************/
  
! #include "include/kstdio.h"
  
  void main(void)
--- 12,16 ----
  \****************************************************************************/
  
! #include "kstdio.h"
  
  void main(void)