openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 07:23:43 +02:00
Code Issues Releases Wiki Activity

Prevent spurious runs of make features introduced by the FT2232 patch

Browse Source 
The new makefile structure uses indirection (.features->features) to
work around a gmake bug which resulted in immediate premature evaluation
of variable definitions with deferred evaluation.

Corresponding to flashrom svn r611.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Carl-Daniel Hailfinger 2009-06-19 14:20:34 +00:00
parent 2eeff4ebb9
commit b18ecbc93f
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -51,7 +51,7 @@ OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.o \
ichspi.o w39v040c.o sb600spi.o wbsio_spi.o m29f002.o internal.o \ ichspi.o w39v040c.o sb600spi.o wbsio_spi.o m29f002.o internal.o \
dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o print.o dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o print.o
all: pciutils .features dep $(PROGRAM) all: pciutils features dep $(PROGRAM)
# Set the flashrom version string from the highest revision number # Set the flashrom version string from the highest revision number
# of the checked out flashrom files. # of the checked out flashrom files.
@ -66,7 +66,11 @@ SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"'
$(PROGRAM): $(OBJS) $(PROGRAM): $(OBJS)
$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS)
flashrom.o: flashrom.c FEATURE_CFLAGS = $(shell LANG=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'")
FEATURE_LIBS = $(shell LANG=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi")
flashrom.o: flashrom.c .features
$(CC) $(CFLAGS) $(CPPFLAGS) $(FEATURE_CFLAGS) -c -o $@ $< $(SVNDEF) $(CC) $(CFLAGS) $(CPPFLAGS) $(FEATURE_CFLAGS) -c -o $@ $< $(SVNDEF)
%.o: %.c .features %.o: %.c .features
@ -93,9 +97,7 @@ compiler:
rm -f .test.c .test; exit 1) rm -f .test.c .test; exit 1)
@rm -f .test.c .test @rm -f .test.c .test
# We don't specify compiler as requirement because the compiler is already pciutils: compiler
# checked during makefile remake through .features
pciutils:
@printf "Checking for pciutils and zlib... " @printf "Checking for pciutils and zlib... "
@$(shell ( echo "#include <pci/pci.h>"; \ @$(shell ( echo "#include <pci/pci.h>"; \
echo "struct pci_access *pacc;"; \ echo "struct pci_access *pacc;"; \
@ -108,16 +110,18 @@ pciutils:
rm -f .test.c .test; exit 1) rm -f .test.c .test; exit 1)
@rm -f .test.c .test @rm -f .test.c .test
.features: compiler .features: features
features: compiler
@echo "FEATURES := yes" > .features.tmp
@printf "Checking for FTDI support... " @printf "Checking for FTDI support... "
@$(shell ( echo "#include <ftdi.h>"; \ @$(shell ( echo "#include <ftdi.h>"; \
echo "struct ftdi_context *ftdic = NULL;"; \ echo "struct ftdi_context *ftdic = NULL;"; \
echo "int main(int argc, char **argv)"; \ echo "int main(int argc, char **argv)"; \
echo "{ return ftdi_init(ftdic); }"; ) > .featuretest.c ) echo "{ return ftdi_init(ftdic); }"; ) > .featuretest.c )
@$(CC) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest $(LIBS) -lftdi >/dev/null 2>&1 && \ @$(CC) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest $(LIBS) -lftdi >/dev/null 2>&1 && \
( echo "found."; echo FEATURE_CFLAGS := -D'FT2232_SPI_SUPPORT=1' > .features.tmp; \ ( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) || \
echo FEATURE_LIBS := -lftdi >> .features.tmp) || \ ( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp )
( echo "not found."; echo "" > .features.tmp )
@$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features
@rm -f .featuretest.c .featuretest @rm -f .featuretest.c .featuretest
@ -138,7 +142,6 @@ tarball: export
@rm -rf $(EXPORTDIR)/flashrom-$(VERSION) @rm -rf $(EXPORTDIR)/flashrom-$(VERSION)
@echo Created $(EXPORTDIR)/flashrom-$(VERSION).tar.gz @echo Created $(EXPORTDIR)/flashrom-$(VERSION).tar.gz
.PHONY: all clean distclean dep compiler pciutils export tarball .PHONY: all clean distclean dep compiler pciutils features export tarball
-include .dependencies -include .dependencies
-include .features