summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lam <plam@MIT.EDU>2006-02-05 04:11:08 +0000
committerPatrick Lam <plam@MIT.EDU>2006-02-05 04:11:08 +0000
commit788c4af232f5677d73e8e2e77e123cf566530ccb (patch)
treec534b92ea88b1a91fce70b16a76220cadbcf0e28
parent68355f38774fe55d8010268291a170492b241a71 (diff)
Make 'make distcheck' work with automake 1.6.3.
reviewed by: plam
-rw-r--r--ChangeLog10
-rw-r--r--doc/Makefile.am2
-rw-r--r--fc-cache/Makefile.am2
-rw-r--r--fc-cat/Makefile.am2
-rw-r--r--fc-list/Makefile.am2
5 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 76aeb622..4af5f5d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-04 Behdad Esfahbod <behdad@cs.toronto.edu>
+ reviewed by: plam
+
+ * doc/Makefile.am:
+ * fc-cache/Makefile.am:
+ * fc-cat/Makefile.am:
+ * fc-list/Makefile.am:
+
+ Make 'make distcheck' work with automake 1.6.3.
+
2006-02-03 Takashi IWAI <tiwai@suse.de>
reviewed by: plam
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b1a2aee4..10450b1c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -86,7 +86,7 @@ docdir=@DOCDIR@
DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*
-EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL) confdir.sgml.in
+EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) func.sgml confdir.sgml.in
SUFFIXES=.fncs .sgml .txt .html
diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 798506f2..285f2865 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -39,7 +39,7 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
bin_PROGRAMS=fc-cache
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cache.sgml
fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 55a755e4..53c2b733 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -33,7 +33,7 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
bin_PROGRAMS=fc-cat
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cat.sgml
fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index e16ae411..6ad19ba3 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS=fc-list
INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-list.sgml
fc_list_LDADD = ${top_builddir}/src/libfontconfig.la