tools: Fix broken object compilation rules

As these rules depend on non-existing headers as well (likely copy &
pasted from fiptool), they never matched, and the built-in rules were
used. That led to random breakages when e.g. CPPFLAGS was suddenly
evaluated and contained invalid options.

For the stm32image, this reveals that we were relying on the built-in
rules by passing -D_GNU_SOURCE via CPPFLAGS, rather than using CFLAGS as
used in the local rule. Fix that as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/tools/doimage/Makefile b/tools/doimage/Makefile
index bc74369ff5b142df38efcd9b54ba907d6cf84e64..9cec681a49e1a8c7adb2066ab342e664c270f6bf 100644 (file)
--- a/tools/doimage/Makefile
+++ b/tools/doimage/Makefile
@@ -39,7 +39,7 @@ ${PROJECT}: ${OBJECTS} Makefile
        @echo "Built $@ successfully"
        @echo
 
-%.o: %.c %.h Makefile
+%.o: %.c Makefile
        @echo "  CC      $<"
        ${Q}${CC} -c ${CFLAGS} ${INCLUDE_PATHS} $< -o $@
 

diff --git a/tools/stm32image/Makefile b/tools/stm32image/Makefile
index 80dfbecf0620525b757db46d3fe464964cf2c80c..a593d31637403929fdffce44db59dae4552de3fa 100644 (file)
--- a/tools/stm32image/Makefile
+++ b/tools/stm32image/Makefile
@@ -12,8 +12,7 @@ PROJECT := stm32image${BIN_EXT}
 OBJECTS := stm32image.o
 V := 0
 
-override CPPFLAGS += -D_GNU_SOURCE
-CFLAGS := -Wall -Werror -pedantic -std=c99
+CFLAGS := -Wall -Werror -pedantic -std=c99 -D_GNU_SOURCE
 ifeq (${DEBUG},1)
   CFLAGS += -g -O0 -DDEBUG
 else
@@ -39,7 +38,7 @@ ${PROJECT}: ${OBJECTS} Makefile
        @echo "Built $@ successfully"
        @${ECHO_BLANK_LINE}
 
-%.o: %.c %.h Makefile
+%.o: %.c Makefile
        @echo "  CC      $<"
        ${Q}${CC} -c ${CFLAGS} $< -o $@