[commit] r844 - trunk

Author: hailfinger
Date: 2010-01-09 15:18:01 +0100 (Sat, 09 Jan 2010)
New Revision: 844

Modified:
   trunk/Makefile
Log:
Fix Makefile dependencies if FT2232SPI is not selected.
.features was always regenerated in that case, triggering whole-project
recompiles even if nothing changed.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Sean Nelson

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-01-09 05:30:14 UTC (rev 843)
+++ trunk/Makefile	2010-01-09 14:18:01 UTC (rev 844)
@@ -136,8 +136,8 @@
 NEED_PCI := yes
 endif

+ifeq ($(CONFIG_FT2232SPI), yes)
 FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb")
-ifeq ($(CONFIG_FT2232SPI), yes)
 # 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 @@
    @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)