Add opentype/.

Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>

	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.

	* modules/{basic/basic,arabic/arabic}-xft.c: Include
	pango-engine.h.

	* pango/pangoxft.h: Don't include pango.h to avoid
	getting pango-enum-types.h.

	* pango/Makefile.am (pangoinclude_HEADERS): Move
	XFT_HFILES out of pango_headers, since mkenums.pl
	shouldn't be run on it.

14 files changed, 109 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 71344f27..0a65e61e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 71344f27..0a65e61e 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 71344f27..0a65e61e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 71344f27..0a65e61e 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 71344f27..0a65e61e 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 71344f27..0a65e61e 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 71344f27..0a65e61e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,17 @@
+Wed Dec 20 19:53:09 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am (IGNORE_HFILES): Add opentype/.
+
+	* modules/{basic/basic,arabic/arabic}-xft.c: Include
+	pango-engine.h.
+
+	* pango/pangoxft.h: Don't include pango.h to avoid
+	getting pango-enum-types.h.
+
+	* pango/Makefile.am (pangoinclude_HEADERS): Move 
+	XFT_HFILES out of pango_headers, since mkenums.pl
+	shouldn't be run on it.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: fix freetype check a bit
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 3f677f23..c09e31fc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -15,6 +15,7 @@ FIXXREF_OPTIONS=
 # Headers to ignore
 IGNORE_HFILES=			\
 	mini-fribidi		\
+	opentype		\
 	modules.h		\
 	pango-intset.h		\
 	pango-utils.h		\
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index b8f7b5ad..6ca37eee 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -25,6 +25,7 @@
 #include "arabic-ot.h"
 
 #include "pangoxft.h"
+#include "pango-engine.h"
 #include "pango-utils.h"
 
 static PangoEngineRange arabic_ranges[] = {
diff --git a/modules/arabic/arabic-xft.c b/modules/arabic/arabic-xft.c
index b8f7b5ad..6ca37eee 100644
--- a/modules/arabic/arabic-xft.c
+++ b/modules/arabic/arabic-xft.c
@@ -25,6 +25,7 @@
 #include "arabic-ot.h"
 
 #include "pangoxft.h"
+#include "pango-engine.h"
 #include "pango-utils.h"
 
 static PangoEngineRange arabic_ranges[] = {
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 746a687b..c9be386c 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "pangoxft.h"
+#include "pango-engine.h"
 #include "pango-utils.h"
 
 static PangoEngineRange basic_ranges[] = {
diff --git a/modules/basic/basic-xft.c b/modules/basic/basic-xft.c
index 746a687b..c9be386c 100644
--- a/modules/basic/basic-xft.c
+++ b/modules/basic/basic-xft.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "pangoxft.h"
+#include "pango-engine.h"
 #include "pango-utils.h"
 
 static PangoEngineRange basic_ranges[] = {
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 7a1b5600..fd3ae101 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -106,12 +106,12 @@ pango_headers=		   \
 	pango-tabs.h	   \
 	pango-types.h	   \
 	pango-utils.h	   \
-	pangox.h	   \
-	$(XFT_HFILES)
+	pangox.h
 
-pangoinclude_HEADERS = 	   \
-	$(pango_headers)   \
-	$(pango_built_headers)
+pangoinclude_HEADERS = 	   	\
+	$(pango_headers)   	\
+	$(pango_built_headers)	\
+	$(XFT_HFILES)
 
 pango-enum-types.h: @REBUILD@ $(pango_headers) makeenums.pl
 	$(PERL)	./makeenums.pl include $(pango_headers) > pango-enum-types.h
diff --git a/pango/pangoxft.h b/pango/pangoxft.h
index cbc95afa..b8b8d649 100644
--- a/pango/pangoxft.h
+++ b/pango/pangoxft.h
@@ -23,7 +23,7 @@
 #ifndef __PANGOXFT_H__
 #define __PANGOXFT_H__
 
-#include <pango/pango.h>
+#include <pango/pango-context.h>
 #include <pango/pango-ot.h>
 
 #ifdef __cplusplus