diff options
| author | Evan Lloyd <evan.lloyd@arm.com> | 2015-12-02 18:33:55 +0000 |
|---|---|---|
| committer | Evan Lloyd <evan.lloyd@arm.com> | 2016-04-01 12:33:09 +0100 |
| commit | f1477d4ad879a1244b782b27c1c653ca9f35cc7a (patch) | |
| tree | cc76d413b5b5367a9450a6952ad1602bf35efd81 /tools | |
| parent | aeb25668fb61a5f56de7469dac8c29e1fc7343bf (diff) | |
Make:Make shell commands more portable
Macros are inserted to replace direct invocations of commands that are
problematic on some build environments. (e.g. Some environments expect
\ in paths instead of /.)
The changes take into account mismatched command mappings across
environments.
The new helper file unix.mk retains existing makefile behaviour on unix
like build environments by providing the following macro definitions:
SHELL_COPY cp -f
SHELL_COPY_TREE cp -rf
SHELL_DELETE rm -f
SHELL_DELETE_ALL rm -rf
MAKE_PREREQ_DIR mkdir -p (As make target)
SHELL_REMOVE_DIR rm -rf
Change-Id: I1b5ca5e1208e78230b15284c4af00c1c006cffcb
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cert_create/Makefile | 7 | ||||
| -rw-r--r-- | tools/fip_create/Makefile | 15 |
2 files changed, 13 insertions, 9 deletions
diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile index accd5fcd..b19d618e 100644 --- a/tools/cert_create/Makefile +++ b/tools/cert_create/Makefile @@ -49,6 +49,7 @@ CFLAGS := -Wall -std=c99 MAKE_HELPERS_DIRECTORY := ../../make_helpers/ include ${MAKE_HELPERS_DIRECTORY}build_macros.mk +include ${MAKE_HELPERS_DIRECTORY}unix.mk PLATFORM_ROOT := ../../plat/ include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk @@ -77,7 +78,6 @@ LIB_DIR := -L ${OPENSSL_DIR}/lib LIB := -lssl -lcrypto CC := gcc -RM := rm -rf .PHONY: all clean realclean @@ -95,7 +95,8 @@ ${BINARY}: ${OBJECTS} Makefile ${Q}${CC} -c ${CFLAGS} ${INC_DIR} $< -o $@ clean: - ${Q}${RM} -f src/build_msg.o ${OBJECTS} + $(call SHELL_DELETE_ALL, src/build_msg.o ${OBJECTS}) realclean: clean - ${Q}${RM} -f ${BINARY} + $(call SHELL_DELETE, ${BINARY}) + diff --git a/tools/fip_create/Makefile b/tools/fip_create/Makefile index c72bae53..9f0bf7ac 100644 --- a/tools/fip_create/Makefile +++ b/tools/fip_create/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -28,6 +28,10 @@ # POSSIBILITY OF SUCH DAMAGE. # +MAKE_HELPERS_DIRECTORY := ../../make_helpers/ +include ${MAKE_HELPERS_DIRECTORY}build_macros.mk +include ${MAKE_HELPERS_DIRECTORY}unix.mk + PROJECT = fip_create OBJECTS = fip_create.o @@ -43,7 +47,6 @@ endif INCLUDE_PATHS = -I. CC := gcc -RM := rm -rf .PHONY: all clean @@ -52,14 +55,14 @@ all: ${PROJECT} ${PROJECT}: ${OBJECTS} Makefile @echo " LD $@" ${Q}${CC} ${OBJECTS} -o $@ - @echo + @${ECHO_BLANK_LINE} @echo "Built $@ successfully" - @echo + @${ECHO_BLANK_LINE} %.o: %.c %.h Makefile @echo " CC $<" ${Q}${CC} -c ${CFLAGS} ${INCLUDE_PATHS} $< -o $@ clean: - ${Q}${RM} ${PROJECT} - ${Q}${RM} ${OBJECTS} + $(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS}) + |