Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 12:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make:Allow for extension in tool names.

Browse source 
In some build environments executable programs have a specific file
extension.  The value of BIN_EXT is appended to the relevant tool file
names to allow for this.
The value of BIN_EXT is set, where appropriate, by the build environment
specific make helper (to .exe for Windows build environments).

.gitignore is updated to hide the new (.exe) files.

Change-Id: Icc32f64b750e425265075ad4e0dea18129640b86
This commit is contained in:
Evan Lloyd 2015-12-03 11:35:40 +00:00
parent b169f6a9a1
commit 42a45b51aa
7 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -11,9 +11,11 @@ build/
# Ignore build products from tools # Ignore build products from tools
tools/**/*.o tools/**/*.o
tools/fip_create/fip_create tools/fip_create/fip_create
tools/fip_create/fip_create.exe
tools/cert_create/src/*.o tools/cert_create/src/*.o
tools/cert_create/src/**/*.o tools/cert_create/src/**/*.o
tools/cert_create/cert_create tools/cert_create/cert_create
tools/cert_create/cert_create.exe
# Ignore header files copied. # Ignore header files copied.
tools/fip_create/firmware_image_package.h tools/fip_create/firmware_image_package.h

4
Makefile
View file

@ -377,11 +377,11 @@ endif
# Variables for use with Certificate Generation Tool # Variables for use with Certificate Generation Tool
CRTTOOLPATH ?= tools/cert_create CRTTOOLPATH ?= tools/cert_create
CRTTOOL ?= ${CRTTOOLPATH}/cert_create CRTTOOL ?= ${CRTTOOLPATH}/cert_create${BIN_EXT}
# Variables for use with Firmware Image Package # Variables for use with Firmware Image Package
FIPTOOLPATH ?= tools/fip_create FIPTOOLPATH ?= tools/fip_create
FIPTOOL ?= ${FIPTOOLPATH}/fip_create FIPTOOL ?= ${FIPTOOLPATH}/fip_create${BIN_EXT}
################################################################################ ################################################################################

3
make_helpers/cygwin.mk
View file

@ -37,4 +37,7 @@ ifndef CYGWIN_MK
include ${MAKE_HELPERS_DIRECTORY}unix.mk include ${MAKE_HELPERS_DIRECTORY}unix.mk
# In cygwin executable files have the Windows .exe extension type.
BIN_EXT := .exe
endif endif

3
make_helpers/msys.mk
View file

@ -37,5 +37,8 @@ ifndef MSYS_MK
include ${MAKE_HELPERS_DIRECTORY}unix.mk include ${MAKE_HELPERS_DIRECTORY}unix.mk
# In MSYS executable files have the Windows .exe extension type.
BIN_EXT := .exe
endif endif

2
make_helpers/windows.mk
View file

@ -38,8 +38,8 @@ ifndef WINDOWS_MK
WINDOWS_MK := $(lastword $(MAKEFILE_LIST)) WINDOWS_MK := $(lastword $(MAKEFILE_LIST))
ECHO_BLANK_LINE := @cmd /c echo. ECHO_BLANK_LINE := @cmd /c echo.
DIR_DELIM := $(strip \) DIR_DELIM := $(strip \)
BIN_EXT := .exe
PATH_SEP := ; PATH_SEP := ;
# For some Windows native commands there is a problem with the directory delimiter. # For some Windows native commands there is a problem with the directory delimiter.

2
tools/cert_create/Makefile
View file

@ -32,7 +32,7 @@ PROJECT := cert_create
PLAT := none PLAT := none
V := 0 V := 0
DEBUG := 0 DEBUG := 0
BINARY := ${PROJECT} BINARY := ${PROJECT}${BIN_EXT}
OPENSSL_DIR := /usr OPENSSL_DIR := /usr
OBJECTS := src/cert.o \ OBJECTS := src/cert.o \

2
tools/fip_create/Makefile
View file

@ -32,7 +32,7 @@ MAKE_HELPERS_DIRECTORY := ../../make_helpers/
include ${MAKE_HELPERS_DIRECTORY}build_macros.mk include ${MAKE_HELPERS_DIRECTORY}build_macros.mk
include ${MAKE_HELPERS_DIRECTORY}build_env.mk include ${MAKE_HELPERS_DIRECTORY}build_env.mk
PROJECT := fip_create PROJECT := fip_create${BIN_EXT}
OBJECTS := fip_create.o OBJECTS := fip_create.o
COPIED_H_FILES := uuid.h firmware_image_package.h COPIED_H_FILES := uuid.h firmware_image_package.h