[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/Makefile.am |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 5c49354a782870d632884174f10c7fb10351c667
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Jun 3 19:02:53 2017 +0900

    Force regenerate fcobjshash.h when updating Makefile
    
    To avoid a situation of mismatching the declaration of hash function

diff --git a/src/Makefile.am b/src/Makefile.am
index 3757cf8..bbbfeda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,14 +115,13 @@ fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
 	' - > $@.tmp && \
 	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
 
-fcobjshash.h: fcobjshash.gperf
-	$(AM_V_GEN) $(GPERF) -m 100 $< > $@.tmp && \
+fcobjshash.h: Makefile fcobjshash.gperf
+	$(AM_V_GEN) $(GPERF) -m 100 fcobjshash.gperf > $@.tmp && \
 	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
 
 EXTRA_DIST += \
 	fcobjshash.gperf.h \
-	fcobjshash.gperf \
-	fcobjshash.h
+	fcobjshash.gperf
 
 libfontconfig_la_SOURCES = \
 	fcarch.h \