Removed.

2006-01-28  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/pango-ot-*: Removed.

        * pango/pango-ot-*: Added.

        * pango/Makefile.am, pango/opentype/Makefile.am: Adjusted.

9 files changed, 36 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a4af404..2d65a004 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-01-28  Behdad Esfahbod  <behdad@gnome.org>
 
+	* pango/opentype/pango-ot-*: Removed.
+
+	* pango/pango-ot-*: Added.
+
+	* pango/Makefile.am, pango/opentype/Makefile.am: Adjusted.
+
+2006-01-28  Behdad Esfahbod  <behdad@gnome.org>
+
 	* pango/pangofc-font.h, pango/pangoft2-render.c, pango/pangowin32.c,
 	pango/pangoxft-render.c, docs/tmpl/xft-fonts.sgml,
 	docs/tmp/atsui-fonts.sgml: Documentation improvements.
diff --git a/pango/Makefile.am b/pango/Makefile.am
index c97d986a..1e98d731 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -181,14 +181,14 @@ endif
 
 libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangoft2_1_0_la_LIBADD =			\
-	opentype/libpango-ot.la			\
+	opentype/libmini-harfbuzz.la		\
 	libpango-$(PANGO_API_VERSION).la	\
 	$(INCLUDED_FC_MODULES)			\
 	$(GLIB_LIBS)				\
 	$(FREETYPE_LIBS)			\
 	$(libm)
 libpangoft2_1_0_la_DEPENDENCIES =		\
-	opentype/libpango-ot.la			\
+	opentype/libmini-harfbuzz.la		\
 	libpango-$(PANGO_API_VERSION).la	\
 	$(INCLUDED_FC_MODULES)
 libpangoft2_1_0_la_SOURCES =   	\
@@ -202,7 +202,12 @@ libpangoft2_1_0_la_SOURCES =   	\
 	pangoft2.c		\
 	pangoft2-private.h	\
 	pangoft2-fontmap.c	\
-	pangoft2-render.c
+	pangoft2-render.c	\
+	pango-ot-private.h	\
+	pango-ot-buffer.c	\
+	pango-ot-info.c		\
+	pango-ot-ruleset.c
+
 
 if OS_WIN32
 libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index 14d11564..7c0ba69c 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -1,19 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = 					\
-	-DG_LOG_DOMAIN=\"Pango\"		\
-	-DPANGO_ENABLE_ENGINE			\
-	-DSYSCONFDIR=\"$(sysconfdir)\"		\
-	-DLIBDIR=\"$(libdir)\"			\
+	-DSYSCONFDIR=\"$(sysconfdir)\" 		\
+	-DLIBDIR=\"$(libdir)\" 			\
 	$(PANGO_DEBUG_FLAGS)			\
+	-I$(top_srcdir)				\
 	$(GLIB_CFLAGS)				\
-	$(FREETYPE_CFLAGS)			\
-	$(X_CFLAGS)				\
-	-I$(top_srcdir)
+	$(FREETYPE_CFLAGS)
 
-noinst_LTLIBRARIES = libpango-ot.la
+noinst_LTLIBRARIES = libmini-harfbuzz.la
 
-libpango_ot_la_SOURCES =  	\
+libmini_harfbuzz_la_SOURCES =  	\
 	ftglue.h		\
 	ftglue.c		\
 	ftxopen.c	 	\
@@ -26,13 +23,9 @@ libpango_ot_la_SOURCES =  	\
 	ftxgsub.c		\
 	ftxgsub.h		\
 	otlbuffer.c		\
-	otlbuffer.h		\
-	pango-ot-buffer.c	\
-	pango-ot-info.c		\
-	pango-ot-private.h	\
-	pango-ot-ruleset.c
+	otlbuffer.h
 
-libpango_ot_la_LIBADD = \
+libmini_harfbuzz_la_LIBADD = \
 	$(x_ldflags)	\
 	$(x_libs)	\
 	$(GLIB_LIBS)	\
@@ -48,8 +41,11 @@ ottest_SOURCES = 	\
 	disasm.h
 
 ottest_LDADD = 		\
-	libpango-ot.la	\
+	libmini-harfbuzz.la	\
 	$(FREETYPE_LIBS)
 
 EXTRA_DIST = 		\
-	README
+	README		\
+	FTL.TXT		\
+	FT-license.txt
+
diff --git a/pango/opentype/pango-ot-buffer.c b/pango/pango-ot-buffer.c
index f649ae62..f649ae62 100644
--- a/pango/opentype/pango-ot-buffer.c
+++ b/pango/pango-ot-buffer.c
diff --git a/pango/opentype/pango-ot-info.c b/pango/pango-ot-info.c
index 1899bd02..7ea83933 100644
--- a/pango/opentype/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@ -22,8 +22,7 @@
 #include <config.h>
 
 #include "pango-ot-private.h"
-#include "../pango-utils.h"
-#include "ftglue.h"
+#include "pango-utils.h"
 #include FT_MODULE_H
 
 static void pango_ot_info_class_init (GObjectClass *object_class);
diff --git a/pango/opentype/pango-ot-private.h b/pango/pango-ot-private.h
index 2871cce8..69954352 100644
--- a/pango/opentype/pango-ot-private.h
+++ b/pango/pango-ot-private.h
@@ -24,8 +24,9 @@
 
 #include <glib-object.h>
 
-#include <pango/pango-ot.h>
-#include "ftxopen.h"
+#include "pango-ot.h"
+#include "opentype/ftglue.h"
+#include "opentype/ftxopen.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c
index 838d80e4..f0517063 100644
--- a/pango/opentype/pango-ot-ruleset.c
+++ b/pango/pango-ot-ruleset.c
@@ -21,9 +21,8 @@
 
 #include <config.h>
 
-#include <pango/pango-ot.h>
 #include "pango-ot-private.h"
-#include "../pango-utils.h"
+#include "pango-utils.h"
 
 typedef struct _PangoOTRule PangoOTRule;
 
diff --git a/pango/pango-ot.h b/pango/pango-ot.h
index 79af9ff9..8663e101 100644
--- a/pango/pango-ot.h
+++ b/pango/pango-ot.h
@@ -43,7 +43,7 @@ typedef enum
   PANGO_OT_TABLE_GPOS
 } PangoOTTableType;
 
-/* Note that this much match OTLGlyphItem */
+/* Note that this must match OTLGlyphItem */
 struct _PangoOTGlyph
 {
   guint    glyph;
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index e0bf654d..95ea1657 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -30,7 +30,7 @@
 
 #include <glib/gstdio.h>
 
-#include <mini-fribidi/fribidi.h>
+#include "mini-fribidi/fribidi.h"
 
 #ifndef HAVE_FLOCKFILE
 #  define flockfile(f) (void)1