diff --git a/src/Makefile.inc b/src/Makefile.inc index 499d9a5..d37383f 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -1,12 +1,12 @@ -# $Id$ -# Global 'Source' Options - -# allow you to change your default compiler without affecting your other work -CFLAGS = -CC = gcc -CXX = g++ -LD = ld -AR = ar -REMOVE = rm -rf - -FD_DEVICE = /dev/fd0 +# $Id$ +# Global 'Source' Options + +# allow you to change your default compiler without affecting your other work +CFLAGS = +CC = gcc +CXX = g++ +LD = ld +AR = ar +REMOVE = rm -rf + +FD_DEVICE = /dev/fd0 diff --git a/src/sys/Makefile.inc b/src/sys/Makefile.inc index aa1c3a7..1deafc3 100644 --- a/src/sys/Makefile.inc +++ b/src/sys/Makefile.inc @@ -1,6 +1,6 @@ -# $Id: -# global 'sys' options - -INCLUDES = -I../include -CFLAGS = -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O -KERNEL = ubix.elf +# $Id: +# global 'sys' options + +INCLUDES = -I../include +CFLAGS = -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O +KERNEL = ubix.elf diff --git a/src/sys/net/core/Makefile b/src/sys/net/core/Makefile index fe68df6..96cc433 100644 --- a/src/sys/net/core/Makefile +++ b/src/sys/net/core/Makefile @@ -1,27 +1,27 @@ -# (C) 2002 The UbixOS Project -# $Id$ - -# Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc - -# Objects -OBJS = inet.o mem.o memp.o netif.o pbuf.o stats.o sys.o tcp.o tcp_input.o tcp_output.o udp.o ip.o icmp.o ip_addr.o - -all: $(OBJS) - -# Compile Types -.cc.o: - $(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $< -.cc.s: - $(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $< -.c.o: - $(CC) ${CFLAGS} -I../../include -c -o $@ $< -.c.s: - $(CC) ${CFLAGS} -I../../include -S -o $@ $< -.S.o: - $(CC) ${CFLAGS} -c -o $@ $< - -# Clean up the junk -clean: - $(REMOVE) $(OBJS) +# (C) 2002 The UbixOS Project +# $Id$ + +# Include Global 'Source' Options +include ../../../Makefile.inc +include ../../Makefile.inc + +# Objects +OBJS = inet.o mem.o memp.o netif.o pbuf.o stats.o sys.o tcp.o tcp_input.o tcp_output.o udp.o ip.o icmp.o ip_addr.o + +all: $(OBJS) + +# Compile Types +.cc.o: + $(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $< +.cc.s: + $(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $< +.c.o: + $(CC) ${CFLAGS} -I../../include -c -o $@ $< +.c.s: + $(CC) ${CFLAGS} -I../../include -S -o $@ $< +.S.o: + $(CC) ${CFLAGS} -c -o $@ $< + +# Clean up the junk +clean: + $(REMOVE) $(OBJS)