[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 fc-arch/Makefile.am      |    4 +---
 fc-case/Makefile.am      |    4 +---
 fc-glyphname/Makefile.am |    4 +---
 fc-lang/Makefile.am      |    4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit d50cfeb805f7dec304c1d51d7a7c1c35f55d2e68
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Wed Oct 24 21:47:40 2007 -0700

    Leave generated headers out of distribution (bug 12734).
    
    If the generated header files are included in the distribution, a build
    outside of the source directory will use them. For machine-specific files,
    this generates the wrong result (fcarch.h). Leaving them out of the
    distribution forces them to be built.

diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am
index 819e37a..5fedbfb 100644
--- a/fc-arch/Makefile.am
+++ b/fc-arch/Makefile.am
@@ -37,8 +37,6 @@ ARCHITECTURE=@ARCHITECTURE@
 
 noinst_PROGRAMS=fc-arch
 
-noinst_HEADERS=$(TARG)
-
 noinst_MANS=fc-arch.man
 
 EXTRA_DIST=$(TMPL)
@@ -49,7 +47,7 @@ $(TARG):fc-arch${EXEEXT} $(STMPL) ${top_srcdir}/src/fcint.h ../config.h
 
 ALIAS_FILES = fcalias.h fcaliastail.h
 
-BUILT_SOURCES = $(ALIAS_FILES)
+BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
 
 $(ALIAS_FILES): 
 	touch $(ALIAS_FILES)
diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index e498da0..83ca2de 100644
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -34,8 +34,6 @@ TARG=fccase.h
 
 noinst_PROGRAMS=fc-case
 
-noinst_HEADERS=$(TARG)
-
 noinst_MANS=fc-case.man
 
 fc_case_SRCS= \
@@ -54,7 +52,7 @@ $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
 
 ALIAS_FILES = fcalias.h fcaliastail.h
 
-BUILT_SOURCES = $(ALIAS_FILES)
+BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
 
 $(ALIAS_FILES): 
 	touch $(ALIAS_FILES)
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 063ba00..8aa5ead 100644
--- a/fc-glyphname/Makefile.am
+++ b/fc-glyphname/Makefile.am
@@ -34,8 +34,6 @@ TARG=fcglyphname.h
 
 noinst_PROGRAMS=fc-glyphname
 
-noinst_HEADERS=$(TARG)
-
 noinst_MANS=fc-glyphname.man
 
 GLYPHNAME=zapfdingbats.txt
@@ -49,7 +47,7 @@ $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
 
 ALIAS_FILES = fcalias.h fcaliastail.h
 
-BUILT_SOURCES = $(ALIAS_FILES)
+BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
 
 $(ALIAS_FILES): 
 	touch $(ALIAS_FILES)
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index 8ca9399..f152ab5 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -34,8 +34,6 @@ TARG=fclang.h
 
 noinst_PROGRAMS=fc-lang
 
-noinst_HEADERS=$(TARG)
-
 noinst_MANS=fc-lang.man
 
 ORTH=@ORTH_FILES@
@@ -48,7 +46,7 @@ $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
 
 ALIAS_FILES = fcalias.h fcaliastail.h
 
-BUILT_SOURCES = $(ALIAS_FILES)
+BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
 
 $(ALIAS_FILES): 
 	touch $(ALIAS_FILES)