Don't build the non-existant testfont binary Use glib-mkenums instead of

2001-08-04  Alexander Larsson  <alexl@redhat.com>

	* pango/makefile.msc:
	Don't build the non-existant testfont binary
	Use glib-mkenums instead of the old mkenums.pl
	copy module-defs-win32.c.win32 to module-defs-win32.c

	* pasng/module-defs-win32.c.win32:
	Include the built in basic-win32 stuff.

9 files changed, 36 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 07e026c2..7c7295bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 07e026c2..7c7295bc 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 07e026c2..7c7295bc 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 07e026c2..7c7295bc 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 07e026c2..7c7295bc 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 07e026c2..7c7295bc 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 07e026c2..7c7295bc 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -5,7 +5,7 @@
 	Use glib-mkenums instead of the old mkenums.pl
 	copy module-defs-win32.c.win32 to module-defs-win32.c
 
-	* module-defs-win32.c.win32:
+	* pango/module-defs-win32.c.win32:
 	Include the built in basic-win32 stuff.
 	
 2001-07-27  Darin Adler  <darin@bentspoon.com>
diff --git a/pango/makefile.msc b/pango/makefile.msc
index a4afd2fd..374469d1 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -15,7 +15,7 @@ PANGO_VER = 0.17
 !IFNDEF PACKAGE
 
 DLLS = pango pangowin32 # pangoft2
-EXES = querymodules testfonts
+EXES = querymodules # testfonts
 #? test1 test2 test3 test4 test5
 
 # The main target
@@ -133,11 +133,23 @@ pango_headers=		   \
 	pango-utils.h	   \
 	pangox.h
 
-pango-enum-types.h: $(pango_headers) makeenums.pl
-	$(PERL)	./makeenums.pl include $(pango_headers) > pango-enum-types.h
 
-pango-enum-types.c: $(pango_headers) makeenums.pl pango-enum-types.h
-	$(PERL) ./makeenums.pl cfile $(pango_headers) > pango-enum-types.c
+pango-enum-types.h: $(pango_headers) 
+	$(PERL) ..\..\glib\gobject\glib-mkenums  \
+		--fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n" \
+		--fprod "/* enumerations from \"@filename@\" */\n" \
+		--vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" 	\
+		--ftail "#endif /* __PANGO_ENUM_TYPES_H__ */" \
+		$(pango_headers) ) > pango-enum-types.h
+
+pango-enum-types.c: $(pango_headers) pango-enum-types.h
+	$(PERL) ..\..\glib\gobject\glib-mkenums  \
+		--fhead "#include <pango.h>" \
+		--fprod "\n/* enumerations from \"@filename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const GEnumValue values[] = {" 	\
+		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_enum_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(pango_headers) > pango-enum-types.c
 
 $(PACKAGE).lib : $(OBJECTS) $(PRJ_TOP)\config.h
 	lib /out:$(PACKAGE).lib $(OBJECTS)
@@ -152,6 +164,11 @@ $(PACKAGE).exe : $(PKG_LINK) $(OBJECTS)
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 
+
+module-defs-win32.c: module-defs-win32.c.win32
+	copy module-defs-win32.c.win32 module-defs-win32.c
+
+
 .c.obj :
 	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) -DPANGO_VERSION=\"$(PANGO_VER)\" $<
 
diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32
index 64b129b9..e0b0cfd4 100644
--- a/pango/module-defs-win32.c.win32
+++ b/pango/module-defs-win32.c.win32
@@ -4,6 +4,13 @@
 
 #include "modules.h"
 
+void         _pango_basic_script_engine_list   (PangoEngineInfo **engines,
+					       	gint             *n_engines);
+PangoEngine *_pango_basic_script_engine_load   (const char       *id);
+void         _pango_basic_script_engine_unload (PangoEngine      *engine);
+
+
 PangoIncludedModule _pango_included_win32_modules[] = {
+ { _pango_basic_script_engine_list,  _pango_basic_script_engine_load,  _pango_basic_script_engine_unload },
  { NULL, NULL, NULL },
 };