Changeset 6bc4dbd in mainline for Makefile

Timestamp:

2005-11-08T00:00:15Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5b65205

Parents:

849ba5cb

Message:

new build system upgrade
finished work for IA-32, IA-64, PPC-32, SPARC-64

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -47 +47 @@
 #
 
+DEFS = -DARCH=$(ARCH)
 CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
 LFLAGS = -M
+AFLAGS = 
 
 ## Setup kernel configuration
@@ -129 +131 @@
 
 clean:
+        -rm -f kernel.bin kernel.map kernel.map.pre kernel.objdump generic/src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
         find generic/src/ arch/$(ARCH)/src/ genarch/src/ -name '*.o' -exec rm \{\} \;
-        -rm -f kernel.bin kernel.map kernel.map.pre kernel.objdump generic/src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
         $(MAKE) -C arch/$(ARCH)/boot clean
 
@@ -138 +140 @@
 
 depend: config
-        $(CC) $(CFLAGS) -M $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
+        $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
 
 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
-        $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
@@ -156 +158 @@
 
 boot: kernel.bin
-        $(MAKE) -C arch/$(ARCH)/boot build KERNEL_SIZE="`cat kernel.bin | wc -c`"
+        $(MAKE) -C arch/$(ARCH)/boot build KERNEL_SIZE="`cat kernel.bin | wc -c`" CC=$(CC) AS=$(AS) LD=$(LD)
 
 %.o: %.S
-        $(CC) $(ASFLAGS) $(CFLAGS) -c $< -o $@
+        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -c $< -o $@
 
 %.o: %.s
-        $(AS) $(ASFLAGS) $< -o $@
+        $(AS) $(AFLAGS) $< -o $@
 
 %.o: %.c
-        $(CC) $(CFLAGS) -c $< -o $@
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@