From c1f00c5cda37d0583ca291fc2f3318bb1a398ffa Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 9 Jan 2010 14:18:01 +0000 Subject: Fix Makefile dependencies if FT2232SPI is not selected .features was always regenerated in that case, triggering whole-project recompiles even if nothing changed. Corresponding to flashrom svn r844. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Sean Nelson --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d2f04ec3..423e3153 100644 --- a/Makefile +++ b/Makefile @@ -136,8 +136,8 @@ PROGRAMMER_OBJS += satasii.o NEED_PCI := yes endif -FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") ifeq ($(CONFIG_FT2232SPI), yes) +FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") # This is a totally ugly hack. FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") @@ -280,7 +280,8 @@ features: compiler @rm -f .featuretest.c .featuretest else features: compiler - @echo "FEATURES := yes" > .features + @echo "FEATURES := yes" > .features.tmp + @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features endif install: $(PROGRAM) -- cgit v1.2.3