diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-01-09 14:18:01 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-01-09 14:18:01 +0000 |
| commit | d5da93221233be3d3dba351b58a69354be3c0d34 (patch) | |
| tree | d8613b5f4994f4e3f7f3f012f7642a036e28da7e | |
| parent | c8def6d30c451e2c1518d6a08f224f6087f2b249 (diff) | |
| download | flashrom-d5da93221233be3d3dba351b58a69354be3c0d34.zip flashrom-d5da93221233be3d3dba351b58a69354be3c0d34.tar.gz | |
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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Sean Nelson <audiohacked@gmail.com>
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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) |
