Regenerate x86 line in fcarch.tmpl.h to match change in cache data.

Also remove spurious printf of directory names.

diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am
index 60cd76415a36b6f71205b79573c4f96ab87aaab0..8db30bbaa8528d76dca57767a46aba3d9b99b50d 100644 (file)
--- a/fc-arch/Makefile.am
+++ b/fc-arch/Makefile.am
@@ -43,7 +43,7 @@ noinst_MANS=fc-arch.man
 
 EXTRA_DIST=$(TMPL)
 
-$(TARG):fc-arch${EXEEXT} $(STMPL)
+$(TARG):fc-arch${EXEEXT} $(STMPL) ${top_srcdir}/src/fcint.h ../config.h
        rm -f $(TARG)
        ./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG)
 

diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h
index fe95e51ae6bfd40208342aa6e9fd3b958dd8422e..d8ecdb1a947f0d5bd684bf112d63745affbf8a05 100644 (file)
--- a/fc-arch/fcarch.tmpl.h
+++ b/fc-arch/fcarch.tmpl.h
@@ -29,4 +29,4 @@
 @@@ use something reasonable and don't include any spaces
 @@@
 @@@ name    endian   char     char*    int      Pattern  EltPtr   Elt *    Elt      ObjPtr   VLPtr    Value    Binding  VL *     CharSet  Leaf**   Char16 * Char16   Leaf     Char32   Cache    PageSize
-x86        78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000030_00001000
+x86        78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00001000

diff --git a/src/fcdir.c b/src/fcdir.c
index 86d391b5b4ab38156e9cc6d21c4a15a696379dc7..013686789a60f8817266a876848ef56db9d9df61 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -143,7 +143,6 @@ FcDirScanConfig (FcFontSet  *set,
 
     canon_dir = FcStrCanonFilename (dir);
     if (!canon_dir) canon_dir = (FcChar8 *) dir;
-    printf ("dir %s canon %s\n", dir, canon_dir);
     
     if (config && !FcConfigAcceptFilename (config, canon_dir)) {
        ret = FcTrue;