[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 src/Makefile.am  |   12 +++++++-----
 test/Makefile.am |   16 +++++++---------
 test/run-test.sh |    3 ++-
 3 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 31269e3589e0e6432d12f55db316f4c720a090b5
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Mar 28 18:54:37 2018 +0900

    Do not ship fcobjshash.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 2111ce0..7a35575 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,7 +94,7 @@ BUILT_SOURCES = $(ALIAS_FILES) \
 	../fc-case/fccase.h \
 	../fc-lang/fclang.h \
 	stamp-fcstdint \
-	fcobjshash.h \
+	$(builddir)/fcobjshash.h \
 	fcobjshash.gperf
 
 noinst_PROGRAMS = fcarch
@@ -119,7 +119,7 @@ stamp-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
 	' - > $@.tmp && \
 	mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )
 
-fcobjshash.h: Makefile fcobjshash.gperf
+$(builddir)/fcobjshash.h: Makefile fcobjshash.gperf
 	$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
 	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
 
@@ -151,7 +151,6 @@ libfontconfig_la_SOURCES = \
 	fcname.c \
 	fcobjs.c \
 	fcobjs.h \
-	fcobjshash.h \
 	fcpat.c \
 	fcrange.c \
 	fcserialize.c \
@@ -201,12 +200,15 @@ stamp-fcstdint: $(top_builddir)/config.status
 	$(SHELL) ./config.status src/fcstdint.h
 	@touch $@
 
-CLEANFILES = $(ALIAS_FILES) fontconfig.def
+CLEANFILES =		\
+	$(ALIAS_FILES)	\
+	fontconfig.def	\
+	$(builddir)/fcobjshash.h
+
 DISTCLEANFILES = 	\
 	stamp-fcstdint	\
 	fcstdint.h	\
 	stamp-fcobjshash.gperf	\
-	fcobjshash.h	\
 	fcobjshash.gperf
 
 fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
commit 2cf2e79cb66e29b97bd640a565e4817022f6fdb5
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Mar 28 18:53:52 2018 +0900

    Fix make check fail when srcdir != builddir.

diff --git a/test/Makefile.am b/test/Makefile.am
index 88b7f27..e5b8626 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,19 +8,19 @@ AM_TESTS_ENVIRONMENT= \
 	EXEEXT=${EXEEXT}; export EXEEXT; \
 	$(NULL)
 
-BUILT_SOURCES = out.expected
+BUILT_SOURCES = $(builddir)/out.expected
 
 SH_LOG_COMPILER = sh
 TESTS=run-test.sh
 
-TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
+TESTDATA=4x6.pcf 8x16.pcf fonts.conf.in
 
 if FREETYPE_PCF_LONG_FAMILY_NAMES
-$(srcdir)/out.expected: $(srcdir)/out.expected-long-family-names
-	cp $(srcdir)/out.expected-long-family-names $(srcdir)/out.expected
+$(builddir)/out.expected: $(srcdir)/out.expected-long-family-names Makefile
+	cp $(srcdir)/out.expected-long-family-names $(builddir)/out.expected
 else
-$(srcdir)/out.expected: $(srcdir)/out.expected-no-long-family-names
-	cp $(srcdir)/out.expected-no-long-family-names $(srcdir)/out.expected
+$(builddir)/out.expected: $(srcdir)/out.expected-no-long-family-names Makefile
+	cp $(srcdir)/out.expected-no-long-family-names $(builddir)/out.expected
 endif
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@@ -61,8 +61,6 @@ TESTS += test-name-parse
 
 EXTRA_DIST=run-test.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
 
-CLEANFILES=out fonts.conf
-
-MAINTAINERCLEANFILES=out.expected
+CLEANFILES=out fonts.conf out.expected
 
 -include $(top_srcdir)/git.mk
diff --git a/test/run-test.sh b/test/run-test.sh
index 436dee1..5ef4787 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -26,6 +26,7 @@ case "$OSTYPE" in
 esac
 
 TESTDIR=${srcdir-"$MyPWD"}
+BUILDTESTDIR=${builddir-"$MyPWD"}
 
 FONTDIR="$MyPWD"/fonts
 CACHEDIR="$MyPWD"/cache.dir
@@ -51,7 +52,7 @@ check () {
   echo "=" >> out
   $FCLIST - family pixelsize | sort >> out
   tr -d '\015' <out >out.tmp; mv out.tmp out
-  if cmp out $TESTDIR/$EXPECTED > /dev/null ; then : ; else
+  if cmp out $BUILDTESTDIR/$EXPECTED > /dev/null ; then : ; else
     echo "*** Test failed: $TEST"
     echo "*** output is in 'out', expected output in '$EXPECTED'"
     exit 1