Build:Replace soft links with file copy.
Some build environments do not support symbolic links. This patch
removes the symlinks previously used to build fip_create and instead
copies the relevant header files.
The original motivation for using symlinks was to avoid Trusted Firmware
library headers conflicting with headers in the compiler standard
include path. Copying the header files instead has the same effect.
Like other build artefacts, the copied files are listed in .gitignore.
The distclean targets have also been updated to remove the copies.
Change-Id: Ie8b67bcb133f7f1d660ae93b857950aa15e42b1e
diff --git a/tools/fip_create/Makefile b/tools/fip_create/Makefile
index 52e06a7..da99302 100644
--- a/tools/fip_create/Makefile
+++ b/tools/fip_create/Makefile
@@ -34,6 +34,7 @@
PROJECT = fip_create
OBJECTS = fip_create.o
+COPIED_H_FILES := uuid.h firmware_image_package.h
CFLAGS = -Wall -Werror -pedantic -std=c99
ifeq (${DEBUG},1)
@@ -42,13 +43,12 @@
CFLAGS += -O2
endif
-# Make soft links and include from local directory otherwise wrong headers
-# could get pulled in from firmware tree.
+# Only include from local directory (see comment below).
INCLUDE_PATHS = -I.
CC := gcc
-.PHONY: all clean
+.PHONY: all clean distclean
all: ${PROJECT}
@@ -59,10 +59,25 @@
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}
-%.o: %.c %.h Makefile
+%.o: %.c %.h ${COPIED_H_FILES} Makefile
@echo " CC $<"
${Q}${CC} -c ${CFLAGS} ${INCLUDE_PATHS} $< -o $@
+#
+# Copy required library headers to a local directory so they can be included
+# by this project without adding the library directories to the system include
+# path. This avoids conflicts with definitions in the compiler standard
+# include path.
+#
+uuid.h : ../../include/stdlib/sys/uuid.h
+ $(call SHELL_COPY,$<,$@)
+
+firmware_image_package.h : ../../include/common/firmware_image_package.h
+ $(call SHELL_COPY,$<,$@)
+
clean:
$(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS})
+distclean: clean
+ $(call SHELL_DELETE_ALL, ${COPIED_H_FILES})
+