# HG changeset patch # User Tassilo Philipp # Date 1671096460 -3600 # Node ID f13444192ceb2549192871ef0291cf2295b0d1e1 # Parent d76a991b7d2ab377f259425bdfd0c1d8260fa10a - portability improvements in some test makefiles diff -r d76a991b7d2a -r f13444192ceb test/hacking-arm-thumb-interwork/Makefile.darwin --- a/test/hacking-arm-thumb-interwork/Makefile.darwin Tue Dec 06 23:48:58 2022 +0100 +++ b/test/hacking-arm-thumb-interwork/Makefile.darwin Thu Dec 15 10:27:40 2022 +0100 @@ -5,22 +5,22 @@ # TARGET_ARCH += -mthumb-interwork CFLAGS += -mthumb # CFLAGS = -mthumb-interwork -# CFLAGS_THUMB = -mthumb $(CFLAGS) +# CFLAGS_THUMB = -mthumb ${CFLAGS} # CFLAGS += -mthumb-interwork -all: $(LOADLIBES) test +all: ${LOADLIBES} test thumb.o: thumb.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(TARGET_ARCH) -mthumb $< -o $@ + ${CC} -c ${CPPFLAGS} ${CFLAGS} ${TARGET_ARCH} -mthumb $< -o $@ arm.o: arm.c test.o: test.c test: test.o thumb.o arm.o - $(LINK.o) $^ $(OUTPUT_OPTION) + ${LINK.o} $^ ${OUTPUT_OPTION} %.s: %.c - $(CC) -S $(CPPFLAGS) $(CFLAGS) $(TARGET_ARCH) $< -o $@ + ${CC} -S ${CPPFLAGS} ${CFLAGS} ${TARGET_ARCH} $< -o $@ clean: - $(RM) $(TARGETS) *.o + ${RM} ${TARGETS} *.o diff -r d76a991b7d2a -r f13444192ceb test/hacking-arm-thumb-interwork/Makefile.linux --- a/test/hacking-arm-thumb-interwork/Makefile.linux Tue Dec 06 23:48:58 2022 +0100 +++ b/test/hacking-arm-thumb-interwork/Makefile.linux Thu Dec 15 10:27:40 2022 +0100 @@ -2,9 +2,9 @@ TARGET_ARCH += -mthumb-interwork all: test thumb.o: thumb.c - $(COMPILE.c) $< -mthumb $(OUTPUT_OPTION) + ${COMPILE.c} $< -mthumb ${OUTPUT_OPTION} test: test.o thumb.o arm.o - $(LINK.o) $^ $(OUTPUT_OPTION) + ${LINK.o} $^ ${OUTPUT_OPTION} clean: - $(RM) $(TARGETS) *.o + ${RM} ${TARGETS} *.o diff -r d76a991b7d2a -r f13444192ceb test/hacking-arm-thumb-interwork/diff-gcc-defs/Makefile --- a/test/hacking-arm-thumb-interwork/diff-gcc-defs/Makefile Tue Dec 06 23:48:58 2022 +0100 +++ b/test/hacking-arm-thumb-interwork/diff-gcc-defs/Makefile Thu Dec 15 10:27:40 2022 +0100 @@ -3,7 +3,7 @@ TOP = ../../.. -include $(TOP)/Makefile.config +include ${TOP}/Makefile.config ifeq ("${CONFIG_OS}","iphoneos") DIFFSCRIPT=diff-iphoneos.sh diff -r d76a991b7d2a -r f13444192ceb test/hacking-mips/Makefile --- a/test/hacking-mips/Makefile Tue Dec 06 23:48:58 2022 +0100 +++ b/test/hacking-mips/Makefile Thu Dec 15 10:27:40 2022 +0100 @@ -1,10 +1,10 @@ CFLAGS = MODULES = main.o dispatch.o f.o node.o call.o TARGETS = calls.s test -all: $(TARGETS) -test: $(MODULES) - $(CC) $^ -o $@ +all: ${TARGETS} +test: ${MODULES} + ${CC} $^ -o $@ %.s: %.c - $(CC) -S $< -o $@ + ${CC} -S $< -o $@ clean: - $(RM) $(TARGETS) *.o + ${RM} ${TARGETS} *.o