[affinityos commit] r7 - in trunk: . kernel lib/libc

[codesite...@google.com]

Author: ownthebox.net
Date: Sun Jul 30 05:36:04 2006
New Revision: 7

Modified:
trunk/Makefile.common
trunk/kernel/Makefile
trunk/lib/libc/Makefile

Log:
Updated build files.

Modified: trunk/Makefile.common
==============================================================================
--- trunk/Makefile.common (original)
+++ trunk/Makefile.common Sun Jul 30 05:36:04 2006
@@ -30,16 +30,21 @@

ALL_OBJS = $(OBJECTS)

-CC = i386-elf-gcc
-NASM = nasm
-LD = i386-elf-ld
-AR = i386-elf-ar
+GCC := i386-elf-gcc
+AS := i386-elf-as
+LD := i386-elf-ld
+AR := i386-elf-ar
+NASM := nasm
+NM := i386-elf-nm
+READELF := i386-elf-readelf
+STRIP := i386-elf-strip
+OBJDUMP := i386-elf-objdump

%.o : %.asm
@echo " [$(NASM)] Assembling $(SRC_PATH)/$(<)..."
@$(NASM) -f elf $(<) -o $(@)

%.o : %.c
- @echo " [$(CC)] Compiling $(SRC_PATH)/$(<)..."
- @$(CC) $(CFLAGS) -c $(<) -o $(@)
+ @echo " [$(GCC)] Compiling $(SRC_PATH)/$(<)..."
+ @$(GCC) $(CFLAGS) -c $(<) -o $(@)

Modified: trunk/kernel/Makefile
==============================================================================
--- trunk/kernel/Makefile (original)
+++ trunk/kernel/Makefile Sun Jul 30 05:36:04 2006
@@ -7,7 +7,7 @@

kernel.bin: $(OBJECTS)
@echo " [$(LD)] Linking kernel with $(OBJECTS)"
- @$(LD) -T ../link.ld -o ../kernel.bin $(OBJECTS) $(DOTS)lib/libc.a
+ @$(LD) -T ../link.ld $(OBJECTS) $(DOTS)lib/libc.a

clean:
rm -fr *.o

Modified: trunk/lib/libc/Makefile
==============================================================================
--- trunk/lib/libc/Makefile (original)
+++ trunk/lib/libc/Makefile Sun Jul 30 05:36:04 2006
@@ -6,7 +6,6 @@
include ../../Makefile.common

libc.a: $(ALL_OBJS)
- @echo " [$(AR)] Converting libc objects to a library $(OBJECTS)"
- @$(AR) rcs ../libc.a $(OBJECTS)
+ $(AR) rcs ../libc.a $(OBJECTS)

clean: @rm -f *.o