[openfirmware] [commit] r2129 - in cpu/x86: Darwin Linux
repository service
svn at openfirmware.info
Thu Jan 20 01:01:07 CET 2011
Author: wmb
Date: Thu Jan 20 01:01:07 2011
New Revision: 2129
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2129
Log:
Makefile frobbing - use consistent brace type.
Modified:
cpu/x86/Darwin/Makefile
cpu/x86/Linux/Makefile
Modified: cpu/x86/Darwin/Makefile
==============================================================================
--- cpu/x86/Darwin/Makefile Thu Jan 20 00:40:27 2011 (r2128)
+++ cpu/x86/Darwin/Makefile Thu Jan 20 01:01:07 2011 (r2129)
@@ -6,8 +6,8 @@
MFLAGS = -m32
OPT = -O
-CFLAGS = -g $(MFLAGS) -DTARGET_X86
-LFLAGS = $(MFLAGS)
+CFLAGS = -g ${MFLAGS} -DTARGET_X86
+LFLAGS = ${MFLAGS}
# Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here,
# so we must include it ourselves.
@@ -49,7 +49,7 @@
# Use x86forth when you need to compile new dictionaries that will
# run on x86 systems.
forth: ${OBJS}
- ${CC} $(MFLAGS) -o $@ ${OBJS}
+ ${CC} ${MFLAGS} -o $@ ${OBJS}
@ln -sf forth x86forth
%.o: ${WRDIR}/%.c
@@ -75,7 +75,7 @@
wrapsim.o: ${WRDIR}/wrapper.c
${CC} -c ${ARMCFLAGS} -c $< -o $@
-armsim.trace.o: $(ARMDIR)/armsim.c
+armsim.trace.o: ${ARMDIR}/armsim.c
${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@
armforth: ${ARMSIMOBJS}
Modified: cpu/x86/Linux/Makefile
==============================================================================
--- cpu/x86/Linux/Makefile Thu Jan 20 00:40:27 2011 (r2128)
+++ cpu/x86/Linux/Makefile Thu Jan 20 01:01:07 2011 (r2129)
@@ -6,8 +6,8 @@
MFLAGS = -m32
OPT = -O
-CFLAGS = -g $(MFLAGS) -DTARGET_X86
-LFLAGS = $(MFLAGS)
+CFLAGS = -g ${MFLAGS} -DTARGET_X86
+LFLAGS = ${MFLAGS}
# Uncomment these lines to include X windows support to the wrapper
# via libxcb. The libxcb development package (headers, etc) must be
@@ -44,7 +44,7 @@
@ln -sf forth x86forth
inflate.lo: ${ZIPDIR}/inflate.c
- ${CC} -c $(MFLAGS) -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@
+ ${CC} -c ${MFLAGS} -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@
inflate.o: inflate.lo
${LD} -melf_i386 -T inflate.ld $< -o $@
@@ -71,14 +71,14 @@
wrapsim.o: ${WRDIR}/wrapper.c
${CC} -c ${ARMCFLAGS} -c $< -o $@
-armsim.trace.o: $(ARMDIR)/armsim.c
+armsim.trace.o: ${ARMDIR}/armsim.c
${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@
armforth: ${ARMSIMOBJS}
- ${CC} ${ARMSIMOBJS} -o $@
+ ${CC} ${LFLAGS} ${ARMSIMOBJS} -o $@
armforth.trace: ${ARMTRACEOBJS}
- ${CC} ${ARMTRACEOBJS} -o $@
+ ${CC} ${LFLAGS} ${ARMTRACEOBJS} -o $@
clean:
@rm -f forth x86forth armforth *.o *~ inflate.bin
More information about the openfirmware
mailing list