pango/makefile.mingw.in Update.

2001-03-18  Tor Lillqvist  <tml@iki.fi>

	* pango/makefile.mingw.in
	* pango/pango.def: Update.

	* pango/module-defs-win32.c.win32: New file.

	* pango/Makefile.am (EXTRA_DIST): Add here.

	* pango/mini-fribidi/makefile.mingw: New file.

	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.

13 files changed, 129 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e128a02..61b6b97f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3e128a02..61b6b97f 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3e128a02..61b6b97f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3e128a02..61b6b97f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3e128a02..61b6b97f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3e128a02..61b6b97f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3e128a02..61b6b97f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/makefile.mingw.in
+	* pango/pango.def: Update.
+
+	* pango/module-defs-win32.c.win32: New file.
+
+	* pango/Makefile.am (EXTRA_DIST): Add here.
+
+	* pango/mini-fribidi/makefile.mingw: New file.
+
+	* pango/mini-fribidi/makefile.mingw (EXTRA_DIST): Add here.
+
 Fri Mar  9 11:57:46 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_find_subfont): Remove a lot of 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 17dc9c00..b81ada62 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -166,6 +166,7 @@ EXTRA_DIST =			\
 	$(pango_built_headers)	\
 	makeenums.pl		\
 	module-defs-ft2.c.win32	\
+	module-defs-win32.c.win32 \
 	module-defs.h	        \
 	pango.def		\
 	pangowin32.def		\
diff --git a/pango/makefile.mingw.in b/pango/makefile.mingw.in
index 17e9d22a..a4b03e9d 100644
--- a/pango/makefile.mingw.in
+++ b/pango/makefile.mingw.in
@@ -45,6 +45,7 @@ PANGO_OBJS =					\
 	shape.o
 
 PANGOWIN32_OBJS =				\
+	module-defs-win32.o			\
 	pangowin32.o				\
 	pangowin32-fontcache.o			\
 	pangowin32-fontmap.o
@@ -79,6 +80,9 @@ pango_headers=		   \
 ../config.h : ../config.h.win32
 	cp $< $@
 
+module-defs-win32.c : module-defs-win32.c.win32
+	cp $< $@
+
 module-defs-ft2.c : module-defs-ft2.c.win32
 	cp $< $@
 
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index 50e9f86f..98b22e36 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -21,5 +21,6 @@ libmini_fribidi_la_SOURCES =    \
 
 EXTRA_DIST = 			\
 	README			\
+	makefile.mingw		\
 	fribidi_tables.i	\
 	fribidi-0.1.12.patch
diff --git a/pango/mini-fribidi/makefile.mingw b/pango/mini-fribidi/makefile.mingw
new file mode 100644
index 00000000..dd864e62
--- /dev/null
+++ b/pango/mini-fribidi/makefile.mingw
@@ -0,0 +1,22 @@
+TOP = ../../..
+
+include $(TOP)/build/win32/make.mingw
+
+OPTIMIZE = -g -Wall
+
+INCLUDES = -I ../.. -I ..
+DEPCFLAGS = $(GLIB_CFLAGS)
+
+all :						\
+	../../config.h				\
+	libmini-fribidi.a
+
+MINI_FRIBIDI_OBJS =				\
+	fribidi.o				\
+	fribidi_get_type.o
+../../config.h : ../../config.h.win32
+	cp $< $@
+
+libmini-fribidi.a : $(MINI_FRIBIDI_OBJS)
+	-rm -f $@
+	$(AR) rv $@ $(MINI_FRIBIDI_OBJS)
diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32
new file mode 100644
index 00000000..64b129b9
--- /dev/null
+++ b/pango/module-defs-win32.c.win32
@@ -0,0 +1,9 @@
+/* Hand-written. Once the GNU configure mechanism is used
+ * on Win32, too, can be generated.
+*/
+
+#include "modules.h"
+
+PangoIncludedModule _pango_included_win32_modules[] = {
+ { NULL, NULL, NULL },
+};
diff --git a/pango/pango.def b/pango/pango.def
index 242b37e1..9c7c8d10 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -13,6 +13,7 @@ EXPORTS
 	pango_attr_list_change
 	pango_attr_list_copy
 	pango_attr_list_get_iterator
+	pango_attr_list_get_type
 	pango_attr_list_insert
 	pango_attr_list_insert_before
 	pango_attr_list_new