Bug 390877 – Don't feed pango-features.h to glib-mkenums Patch from

2007-01-03  Behdad Esfahbod  <behdad@gnome.org>

        Bug 390877 – Don't feed pango-features.h to glib-mkenums
        Patch from Yevgen Muntyan

        * pango/Makefile.am: Move pango-features.h to pangoinclude_HEADERS.


svn path=/trunk/; revision=2124

2 files changed, 8 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 76f2503d..9a40d2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-03  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 390877 – Don't feed pango-features.h to glib-mkenums
+	Patch from Yevgen Muntyan
+
+	* pango/Makefile.am: Move pango-features.h to pangoinclude_HEADERS.
+
 2006-12-23  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 384543 – FcFontMatch misuse
@@ -15,13 +22,6 @@
 
 2006-12-23  Behdad Esfahbod  <behdad@gnome.org>
 
-	Patch from Eugeniy Meshcheryakov
-
-	* pango/pangofc-fontmap.c (pango_fc_face_describe):
-	* pango/pangoft2.c (load_fallback_face):
-
-2006-12-23  Behdad Esfahbod  <behdad@gnome.org>
-
 	* pango/pango-utils.c (pango_language_get_default): Improve docs.
 
 2006-12-20  Behdad Esfahbod  <behdad@gnome.org>
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 9c461f83..59e1bcbc 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -101,7 +101,6 @@ pango_headers =		   \
 	pango-context.h	   \
 	pango-coverage.h   \
 	pango-engine.h	   \
-	pango-features.h   \
 	pango-font.h       \
 	pango-fontmap.h	   \
 	pango-fontset.h    \
@@ -120,6 +119,7 @@ pango_headers =		   \
 
 pangoinclude_HEADERS =	   \
 	$(pango_headers)   \
+	pango-features.h   \
 	pango-enum-types.h
 
 pango-enum-types.h: s-enum-types-h