diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/ChangeLog.hb my-gtk/libgnomeprint/ChangeLog.hb
--- from-cvs/libgnomeprint/ChangeLog.hb	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/ChangeLog.hb	Fri Nov 19 13:01:45 2004
@@ -0,0 +1,40 @@
+2004-11-19  Hans Breuer  <hans@breuer.org>
+
+	* config.h.win32 : [new file] support building on win32 without autoconf
+	  libgnomeprint/libgnomeprint/gpa/gpa-printer.c : use g_buildfile_name
+	and g_win32_get_package_installation_subdirectory() to determine additional
+	module dirs at runtime
+
+	* libgnomeprint/gnome-font-face.c
+	  libgnomeprint/gnome-print-pdf-tt.c : added HAVE_UNISTD_H
+
+	* libgnomeprint/gnome-fontmap.c : use g_strcasecmp()
+
+	* libgnomeprint/gnome-print-transport.c
+	  libgnomeprint/gpa/gpa-printer.c : use GLib provided <gdir.h> instead 
+	of <dirent.h>
+
+	* libgnomeprint/gnome-print-transport.c : don't hardcode so names, instead 
+	use the least common denominator GModule is capable to handle
+
+	* libgnomeprint/ttsubset/ttcr.c
+	  libgnomeprint/ttsubset/gnome-print-tt-subset.c
+	  libgnomeprint/gnome-print-ps2.c : open files in binary mode
+	  libgnomeprint/gnome-print.c : ... abd also include <io.h> on
+	win32 to get prototypes for unix like open(), close()
+
+	* libgnomeprint/transports/gp-transport-lpr.c : define popen(),
+	pclose() to their msvcrt name.
+
+	* libgnomeprint/transports/gp-transport-lpr.c : make the prototype of 
+	G_MOUDULE_EXPORT(ed) functions match the implementation
+
+	* libgnomeprint/ttsubset/sft.h : if building with msvc use typedefs
+	from GLib instead of the native GNUC types
+
+	* libgnomeprint/transports/gp-transport-win32.[hc]
+	  libgnomeprint/modules/win32/gnome-print-win32.c : start of win32
+	native printer access
+
+	* libgnomeprint/gnome-print.def : exported symbols
+	  **/makefile.msc : makefile for ms visualc nmake/command line compiler
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/config.h.win32 my-gtk/libgnomeprint/config.h.win32
--- from-cvs/libgnomeprint/config.h.win32	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/config.h.win32	Fri Nov 19 12:27:00 2004
@@ -0,0 +1,14 @@
+/* handcrafted hack to build with msvc on win32 */
+#define GPA_DATA_DIR \
+  g_win32_get_package_installation_subdirectory(NULL, "gnome-print-" VERSION ".dll", "gnome-print")
+#define GPA_MODULES_DIR \
+  g_win32_get_package_installation_subdirectory(NULL, "gnome-print-" VERSION ".dll", "gnome-print")
+#define VERSION "2.8"
+#define GETTEXT_PACKAGE "gnome-print"
+#define M_SQRT1_2 (1.0/M_SQRT2)
+
+#define PNG_COLOR_TYPE_RGBA PNG_COLOR_TYPE_RGB_ALPHA
+#define GNOME_PRINT_MODULES_DIR \
+  g_win32_get_package_installation_subdirectory(NULL, "gnome-print-" VERSION ".dll", "gnome-print")
+
+#define bzero(p,n) memset(p,0,n)
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-font-face.c my-gtk/libgnomeprint/libgnomeprint/gnome-font-face.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-font-face.c	Thu Sep 23 19:19:07 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-font-face.c	Sun Nov 14 00:20:16 2004
@@ -29,7 +29,9 @@
 
 #include <config.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <ctype.h>
 #include <string.h>
 #include <stdarg.h>
@@ -599,7 +601,7 @@
 
 	for (l = map->fonts; l != NULL; l = l->next) {
 		entry = (GPFontEntry *) l->data;
-		if (!strcasecmp (family, entry->familyname)) {
+		if (!g_strcasecmp (family, entry->familyname)) {
 			if (entry->type == GP_FONT_ENTRY_ALIAS)
 				entry = ((GPFontEntryAlias *) entry)->ref;
 			dist = abs (weight - entry->Weight) +
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-fontmap.c my-gtk/libgnomeprint/libgnomeprint/gnome-fontmap.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-fontmap.c	Mon Sep 13 16:43:54 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-fontmap.c	Sun Nov 14 00:21:11 2004
@@ -215,15 +215,15 @@
 	c = strrchr ((gchar *) fc_file, '.');
 	if (!c)
 		return NULL;
-	else if (strcasecmp (c, ".pfb") == 0)
+	else if (g_strcasecmp (c, ".pfb") == 0)
 		font_type = GP_FONT_ENTRY_TYPE1;
-	else if (strcasecmp (c, ".pfa") == 0)
+	else if (g_strcasecmp (c, ".pfa") == 0)
 		font_type = GP_FONT_ENTRY_TYPE1;
-	else if (strcasecmp (c, ".ttf") == 0)
+	else if (g_strcasecmp (c, ".ttf") == 0)
 		font_type = GP_FONT_ENTRY_TRUETYPE;
-	else if (strcasecmp (c, ".ttc") == 0)
+	else if (g_strcasecmp (c, ".ttc") == 0)
 		font_type = GP_FONT_ENTRY_TRUETYPE;
-	else if (strcasecmp (c, ".font") == 0) /* See #102400 */
+	else if (g_strcasecmp (c, ".font") == 0) /* See #102400 */
 		font_type = GP_FONT_ENTRY_TRUETYPE;
 	else {
 		return NULL;
@@ -571,7 +571,7 @@
 static gint
 gp_fe_sortname (gconstpointer a, gconstpointer b)
 {
-	return strcasecmp (((GPFontEntry *) a)->name, ((GPFontEntry *) b)->name);
+	return g_strcasecmp (((GPFontEntry *) a)->name, ((GPFontEntry *) b)->name);
 }
 
 static gint
@@ -582,13 +582,13 @@
 	if (((GPFontEntry *)b)->speciesname == NULL)
 		return 1;
 	
-	return strcasecmp (((GPFontEntry *) a)->speciesname, ((GPFontEntry *) b)->speciesname);
+	return g_strcasecmp (((GPFontEntry *) a)->speciesname, ((GPFontEntry *) b)->speciesname);
 }
 
 static gint
 gp_familyentry_sortname (gconstpointer a, gconstpointer b)
 {
-	return strcasecmp (((GPFamilyEntry *) a)->name, ((GPFamilyEntry *) b)->name);
+	return g_strcasecmp (((GPFamilyEntry *) a)->name, ((GPFamilyEntry *) b)->name);
 }
 
 GnomeFontWeight
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print-pdf-tt.c my-gtk/libgnomeprint/libgnomeprint/gnome-print-pdf-tt.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print-pdf-tt.c	Mon Jun 21 21:39:07 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print-pdf-tt.c	Sun Nov 14 00:03:34 2004
@@ -27,7 +27,9 @@
 
 #include <config.h>
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-private.h>
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print-pdf.c my-gtk/libgnomeprint/libgnomeprint/gnome-print-pdf.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print-pdf.c	Sat Sep 11 04:00:01 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print-pdf.c	Sun Nov 14 00:02:52 2004
@@ -30,7 +30,9 @@
 #include <math.h>
 #include <string.h>
 #include <time.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <locale.h>
 
 #include <libart_lgpl/art_affine.h>
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print-ps2.c my-gtk/libgnomeprint/libgnomeprint/gnome-print-ps2.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print-ps2.c	Fri Oct 01 18:51:58 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print-ps2.c	Thu Nov 18 09:30:13 2004
@@ -31,7 +31,9 @@
 #include <math.h>
 #include <string.h>
 #include <time.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <locale.h>
 
 #include <libart_lgpl/art_affine.h>
@@ -264,7 +266,7 @@
 		g_free (tmp);
 		return GNOME_PRINT_ERROR_UNKNOWN;
 	}
-	ps2->buf = fdopen (fd, "r+");
+	ps2->buf = fdopen (fd, "rb+");
 	ps2->bufname = tmp;
 
 	/* Set bbox to emty practical infinity */
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print-svg.c my-gtk/libgnomeprint/libgnomeprint/gnome-print-svg.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print-svg.c	Tue Feb 24 04:42:58 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print-svg.c	Sun Nov 14 00:04:25 2004
@@ -28,7 +28,9 @@
 #include <math.h>
 #include <string.h>
 #include <time.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <png.h>
 
 #include <libart_lgpl/art_affine.h>
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print-transport.c my-gtk/libgnomeprint/libgnomeprint/gnome-print-transport.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print-transport.c	Sun Jan 11 08:35:37 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print-transport.c	Sun Nov 14 23:06:41 2004
@@ -243,9 +243,11 @@
 	module = g_hash_table_lookup (modules, module_name);
 
 	if (!module) {
+		gchar *dir = g_build_filename (GNOME_PRINT_MODULES_DIR, "transports", NULL);
 		insert = TRUE;
-		path = g_module_build_path (GNOME_PRINT_MODULES_DIR "/transports", module_name);
+		path = g_module_build_path (dir, module_name);
 		module = g_module_open (path, G_MODULE_BIND_LAZY);
+		g_free (dir);
 	}
 
 	if (!module) {
@@ -299,12 +301,12 @@
 	gnome_print_config_get_boolean (config, "Settings.Output.Job.PrintToFile", &print_to_file);
 
 	if (print_to_file) {
-		module_name = g_strdup ("libgnomeprint-file.so");
+		module_name = g_strdup ("gnomeprint-file");
 	} else {
 		module_name = gnome_print_config_get (config, "Settings.Transport.Backend.Module");
 		if (!module_name) {
 			g_warning ("Could not find \"Settings.Transport.Backend.Module\" using default");
-			module_name = g_strdup ("libgnomeprint-lpr.so");
+			module_name = g_strdup ("gnomeprint-lpr");
 		}
 	} 
 
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print.c my-gtk/libgnomeprint/libgnomeprint/gnome-print.c
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print.c	Wed Oct 13 01:28:08 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print.c	Thu Nov 18 09:29:32 2004
@@ -30,6 +30,11 @@
 #include <gmodule.h>
 #include <errno.h>
 
+#ifdef G_OS_WIN32
+#include <io.h>
+typedef gssize ssize_t;
+#endif
+
 #include <libgnomeprint/gnome-print-i18n.h>
 #include <libgnomeprint/gnome-print-private.h>
 #include <libgnomeprint/gp-gc-private.h>
@@ -574,7 +579,7 @@
 	b->was_mmaped = FALSE;
 	b->fd = -1;
 
-	fh = open (file_name, O_RDONLY);
+	fh = open (file_name, O_RDONLY | O_BINARY);
 	if (fh < 0) {
 		g_warning ("Can't open \"%s\"", file_name);
 		return GNOME_PRINT_ERROR_UNKNOWN;
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gnome-print.def my-gtk/libgnomeprint/libgnomeprint/gnome-print.def
--- from-cvs/libgnomeprint/libgnomeprint/gnome-print.def	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/gnome-print.def	Fri Nov 19 13:11:36 2004
@@ -0,0 +1,427 @@
+EXPORTS
+	gnome_font_face_find
+	gnome_font_face_find_closest
+	gnome_font_face_find_closest_from_pango_description
+	gnome_font_face_find_closest_from_pango_font
+	gnome_font_face_find_closest_from_weight_slant
+	gnome_font_face_find_from_family_and_style
+	gnome_font_face_find_from_filename
+	gnome_font_face_get_ascender
+	gnome_font_face_get_descender
+	gnome_font_face_get_family_name
+	gnome_font_face_get_font
+	gnome_font_face_get_font_default
+	gnome_font_face_get_font_full
+	gnome_font_face_get_glyph_ps_name
+	gnome_font_face_get_glyph_stdadvance
+	gnome_font_face_get_glyph_stdbbox
+	gnome_font_face_get_glyph_stdkerning
+	gnome_font_face_get_glyph_stdoutline
+	gnome_font_face_get_glyph_width
+	gnome_font_face_get_name
+	gnome_font_face_get_num_glyphs
+	gnome_font_face_get_ps_name
+	gnome_font_face_get_sample
+	gnome_font_face_get_species_name
+	gnome_font_face_get_stdbbox
+	gnome_font_face_get_type
+	gnome_font_face_get_underline_position
+	gnome_font_face_get_underline_thickness
+	gnome_font_face_get_weight_code
+	gnome_font_face_is_fixed_width
+	gnome_font_face_is_italic
+	gnome_font_face_load
+	gnome_font_face_lookup_default
+	gnome_font_face_ps_embed
+	gnome_font_face_pso_free
+	gnome_font_face_pso_mark_glyph
+	gnome_font_face_pso_new
+	gnome_font_family_get_face_by_stylename
+	gnome_font_family_get_type
+	gnome_font_family_list
+	gnome_font_family_list_free
+	gnome_font_family_new
+	gnome_font_family_style_list
+	gnome_font_family_style_list_free
+	gnome_font_find
+	gnome_font_find_closest
+	gnome_font_find_closest_from_full_name
+	gnome_font_find_closest_from_weight_slant
+	gnome_font_find_from_filename
+	gnome_font_find_from_full_name
+	gnome_font_get_ascender
+	gnome_font_get_closest_pango_font
+	gnome_font_get_descender
+	gnome_font_get_face
+	gnome_font_get_family_name
+	gnome_font_get_full_name
+	gnome_font_get_glyph_stdadvance
+	gnome_font_get_glyph_stdbbox
+	gnome_font_get_glyph_stdkerning
+	gnome_font_get_glyph_stdoutline
+	gnome_font_get_glyph_width
+	gnome_font_get_name
+	gnome_font_get_pango_description
+	gnome_font_get_ps_name
+	gnome_font_get_rfont
+	gnome_font_get_size
+	gnome_font_get_species_name
+	gnome_font_get_type
+	gnome_font_get_underline_position
+	gnome_font_get_underline_thickness
+	gnome_font_get_width_utf8
+	gnome_font_get_width_utf8_sized
+	gnome_font_list
+	gnome_font_list_free
+	gnome_font_lookup_default
+	gnome_font_style_list
+	gnome_font_style_list_free
+	gnome_glyphlist_advance
+	gnome_glyphlist_bbox
+	gnome_glyphlist_check
+	gnome_glyphlist_color
+	gnome_glyphlist_duplicate
+	gnome_glyphlist_font
+	gnome_glyphlist_from_text_dumb
+	gnome_glyphlist_from_text_sized_dumb
+	gnome_glyphlist_glyph
+	gnome_glyphlist_glyphs
+	gnome_glyphlist_kerning
+	gnome_glyphlist_letterspace
+	gnome_glyphlist_moveto
+	gnome_glyphlist_moveto_x
+	gnome_glyphlist_moveto_y
+	gnome_glyphlist_new
+	gnome_glyphlist_ref
+	gnome_glyphlist_rmoveto
+	gnome_glyphlist_rmoveto_x
+	gnome_glyphlist_rmoveto_y
+	gnome_glyphlist_text_dumb
+	gnome_glyphlist_text_sized_dumb
+	gnome_glyphlist_unref
+	gnome_pgl_bbox
+	gnome_pgl_destroy
+	gnome_pgl_from_gl
+	gnome_pgl_render_rgb8
+	gnome_pgl_render_rgba8
+	gnome_pgl_test_point
+	gnome_print_arcto
+	gnome_print_art_rgba_rgba_affine
+	gnome_print_art_rgba_svp_alpha
+	gnome_print_beginpage
+	gnome_print_bpath
+	gnome_print_buffer_mmap
+	gnome_print_buffer_munmap
+	gnome_print_clip
+	gnome_print_clip_bpath_rule
+	gnome_print_closepath
+	gnome_print_concat
+	gnome_print_config_default
+	gnome_print_config_dump
+	gnome_print_config_dup
+	gnome_print_config_from_string
+	gnome_print_config_get
+	gnome_print_config_get_boolean
+	gnome_print_config_get_double
+	gnome_print_config_get_int
+	gnome_print_config_get_layout_data
+	gnome_print_config_get_length
+	gnome_print_config_get_node
+	gnome_print_config_get_option
+	gnome_print_config_get_page_size
+	gnome_print_config_get_transform
+	gnome_print_config_get_type
+	gnome_print_config_insert_boolean
+	gnome_print_config_insert_options
+	gnome_print_config_ref
+	gnome_print_config_set
+	gnome_print_config_set_boolean
+	gnome_print_config_set_double
+	gnome_print_config_set_int
+	gnome_print_config_set_length
+	gnome_print_config_to_string
+	gnome_print_config_unref
+	gnome_print_context_close
+	gnome_print_context_construct
+	gnome_print_context_create_transport
+	gnome_print_context_get_type
+	gnome_print_context_new
+	gnome_print_convert_distance
+	gnome_print_convert_distance_full
+	gnome_print_curveto
+	gnome_print_decode_ascii85
+	gnome_print_decode_ascii85_wcs
+	gnome_print_decode_hex
+	gnome_print_decode_hex_wcs
+	gnome_print_embed_pdf_font
+	gnome_print_encode_ascii85
+	gnome_print_encode_ascii85_wcs
+	gnome_print_encode_blank
+	gnome_print_encode_deflate
+	gnome_print_encode_deflate_wcs
+	gnome_print_encode_drow
+	gnome_print_encode_drow_wcs
+	gnome_print_encode_hex
+	gnome_print_encode_hex_wcs
+	gnome_print_encode_rlc
+	gnome_print_encode_rlc_wcs
+	gnome_print_encode_tiff
+	gnome_print_encode_tiff_wcs
+	gnome_print_end_doc
+	gnome_print_eoclip
+	gnome_print_eofill
+	gnome_print_fill
+	gnome_print_fill_bpath_rule
+	gnome_print_frgba_get_type
+	gnome_print_frgba_new
+	gnome_print_glyphlist
+	gnome_print_glyphlist_transform
+	gnome_print_grayimage
+	gnome_print_grestore
+	gnome_print_gsave
+	gnome_print_image_transform
+	gnome_print_job_close
+	gnome_print_job_get_config
+	gnome_print_job_get_context
+	gnome_print_job_get_page_size
+	gnome_print_job_get_page_size_from_config
+	gnome_print_job_get_pages
+	gnome_print_job_get_type
+	gnome_print_job_new
+	gnome_print_job_print
+	gnome_print_job_print_to_file
+	gnome_print_job_render
+	gnome_print_job_render_page
+	gnome_print_job_set_file
+	gnome_print_layout_data_free
+	gnome_print_layout_free
+	gnome_print_layout_new_from_data
+	gnome_print_line_stroked
+	gnome_print_lineto
+	gnome_print_meta_get_buffer
+	gnome_print_meta_get_length
+	gnome_print_meta_get_pages
+	gnome_print_meta_get_type
+	gnome_print_meta_new
+	gnome_print_meta_render_data
+	gnome_print_meta_render_data_page
+	gnome_print_meta_render_file
+	gnome_print_meta_render_file_page
+	gnome_print_moveto
+	gnome_print_multipage_finish_page
+	gnome_print_multipage_get_type
+	gnome_print_multipage_new
+	gnome_print_newpath
+	gnome_print_pango_create_context
+	gnome_print_pango_create_layout
+	gnome_print_pango_font_map_new
+	gnome_print_pango_get_default_font_map
+	gnome_print_pango_glyph_string
+	gnome_print_pango_layout
+	gnome_print_pango_layout_line
+	gnome_print_pango_layout_print
+	gnome_print_pango_update_context
+	gnome_print_paper_free_list
+	gnome_print_paper_get_by_name
+	gnome_print_paper_get_by_size
+	gnome_print_paper_get_closest_by_size
+	gnome_print_paper_get_default
+	gnome_print_paper_get_list
+	gnome_print_parse_transform
+	gnome_print_pdf_fprintf
+	gnome_print_pdf_get_type
+	gnome_print_pdf_new
+	gnome_print_pdf_object_end
+	gnome_print_pdf_object_new
+	gnome_print_pdf_object_start
+	gnome_print_pdf_print_double
+	gnome_print_pdf_print_sized
+	gnome_print_pdf_t1_embed
+	gnome_print_pdf_tt_subset_embed
+	gnome_print_ps2_get_type
+	gnome_print_ps2_new
+	gnome_print_rbuf_get_type
+	gnome_print_rbuf_new
+	gnome_print_rect_filled
+	gnome_print_rect_stroked
+	gnome_print_rgbaimage
+	gnome_print_rgbimage
+	gnome_print_rgbp_construct
+	gnome_print_rgbp_get_type
+	gnome_print_rgbp_new
+	gnome_print_rotate
+	gnome_print_scale
+	gnome_print_setdash
+	gnome_print_setfont
+	gnome_print_setlinecap
+	gnome_print_setlinejoin
+	gnome_print_setlinewidth
+	gnome_print_setmiterlimit
+	gnome_print_setopacity
+	gnome_print_setrgbcolor
+	gnome_print_show
+	gnome_print_show_sized
+	gnome_print_showpage
+	gnome_print_stroke
+	gnome_print_stroke_bpath
+	gnome_print_strokepath
+	gnome_print_svg_get_type
+	gnome_print_svg_new
+	gnome_print_translate
+	gnome_print_transport_close
+	gnome_print_transport_construct
+	gnome_print_transport_get_type
+	gnome_print_transport_new
+	gnome_print_transport_open
+	gnome_print_transport_print_file
+	gnome_print_transport_printf
+	gnome_print_transport_write
+	gnome_print_unit_free_list
+	gnome_print_unit_get_by_abbreviation
+	gnome_print_unit_get_by_name
+	gnome_print_unit_get_default
+	gnome_print_unit_get_identity
+	gnome_print_unit_get_list
+	gnome_print_unit_get_name
+	gnome_print_unit_get_type
+	gnome_print_vpath
+	gnome_rfont_get_closest_pango_font
+	gnome_rfont_get_face
+	gnome_rfont_get_font
+	gnome_rfont_get_glyph_bpath
+	gnome_rfont_get_glyph_stdadvance
+	gnome_rfont_get_glyph_stdbbox
+	gnome_rfont_get_glyph_stdkerning
+	gnome_rfont_get_glyph_svp
+	gnome_rfont_get_matrix
+	gnome_rfont_get_pango_description
+	gnome_rfont_get_type
+	gnome_rfont_render_glyph_rgb8
+	gnome_rfont_render_glyph_rgba8
+	gp_font_entry_ref
+	gp_font_entry_unref
+	gp_fontmap_get
+	gp_fontmap_lookup_weight
+	gp_fontmap_release
+	gp_gc_clip
+	gp_gc_close_all
+	gp_gc_closepath
+	gp_gc_concat
+	gp_gc_currentpath_all_closed
+	gp_gc_currentpath_all_open
+	gp_gc_currentpath_points
+	gp_gc_curveto
+	gp_gc_eoclip
+	gp_gc_get_blue
+	gp_gc_get_clipsvp
+	gp_gc_get_color_flag
+	gp_gc_get_ctm
+	gp_gc_get_ctm_flag
+	gp_gc_get_currentpath
+	gp_gc_get_currentpoint
+	gp_gc_get_dash
+	gp_gc_get_dash_flag
+	gp_gc_get_data
+	gp_gc_get_font
+	gp_gc_get_font_flag
+	gp_gc_get_green
+	gp_gc_get_line_flag
+	gp_gc_get_linecap
+	gp_gc_get_linejoin
+	gp_gc_get_linewidth
+	gp_gc_get_miterlimit
+	gp_gc_get_opacity
+	gp_gc_get_red
+	gp_gc_get_rgba
+	gp_gc_grestore
+	gp_gc_gsave
+	gp_gc_has_clipsvp
+	gp_gc_has_currentpath
+	gp_gc_has_currentpoint
+	gp_gc_lineto
+	gp_gc_moveto
+	gp_gc_new
+	gp_gc_newpath
+	gp_gc_ref
+	gp_gc_reset
+	gp_gc_set_color_flag
+	gp_gc_set_ctm_flag
+	gp_gc_set_dash
+	gp_gc_set_dash_flag
+	gp_gc_set_data
+	gp_gc_set_font
+	gp_gc_set_font_flag
+	gp_gc_set_line_flag
+	gp_gc_set_linecap
+	gp_gc_set_linejoin
+	gp_gc_set_linewidth
+	gp_gc_set_miterlimit
+	gp_gc_set_opacity
+	gp_gc_set_rgbcolor
+	gp_gc_setmatrix
+	gp_gc_strokepath
+	gp_gc_unref
+	gp_path_all_closed
+	gp_path_all_open
+	gp_path_any_closed
+	gp_path_any_open
+	gp_path_close_all
+	gp_path_closed_parts
+	gp_path_closepath
+	gp_path_closepath_current
+	gp_path_concat
+	gp_path_copy
+	gp_path_currentpoint
+	gp_path_curveto
+	gp_path_duplicate
+	gp_path_ensure_space
+	gp_path_finish
+	gp_path_first_bpath
+	gp_path_has_currentpoint
+	gp_path_is_empty
+	gp_path_last_bpath
+	gp_path_lineto
+	gp_path_lineto_moving
+	gp_path_moveto
+	gp_path_new
+	gp_path_new_from_bpath
+	gp_path_new_from_foreign_bpath
+	gp_path_new_from_static_bpath
+	gp_path_new_sized
+	gp_path_open_parts
+	gp_path_ref
+	gp_path_reset
+	gp_path_split
+	gp_path_unref
+	gpa_config_get_type
+	gpa_get_printers
+	gpa_key_get_type
+	gpa_key_insert
+	gpa_list_get_default
+	gpa_list_get_type
+	gpa_list_set_default
+	gpa_model_get_by_id
+	gpa_model_get_type
+	gpa_model_new_from_xml_str
+	gpa_node_attach
+	gpa_node_get_child
+	gpa_node_get_child_from_path
+	gpa_node_get_path_value
+	gpa_node_get_type
+	gpa_node_get_value
+	gpa_node_id
+	gpa_node_lookup
+	gpa_node_ref
+	gpa_node_set_path_value
+	gpa_node_set_value
+	gpa_node_unref
+	gpa_node_verify
+	gpa_option_get_name
+	gpa_printer_get_default_settings
+	gpa_printer_get_state_by_id
+	gpa_printer_get_type
+	gpa_printer_new
+	gpa_printer_set_polling
+	gpa_reference_get_type
+	gpa_settings_get_type
+	gpa_settings_new
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gpa/gpa-printer.c my-gtk/libgnomeprint/libgnomeprint/gpa/gpa-printer.c
--- from-cvs/libgnomeprint/libgnomeprint/gpa/gpa-printer.c	Wed Jul 21 03:02:37 2004
+++ my-gtk/libgnomeprint/libgnomeprint/gpa/gpa-printer.c	Sun Nov 14 18:04:57 2004
@@ -29,10 +29,10 @@
 #include <locale.h>
 #include <string.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include <gmodule.h>
 #include <glibconfig.h>
+#include <gdir.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
@@ -385,8 +385,8 @@
 static gboolean
 gpa_printer_list_load_from_module_dir (GPAList *printers, const gchar *dir_path)
 {
-	struct dirent *entry;
-	DIR *dir;
+	const char *entry;
+	GDir *dir;
 	gint ext_len = strlen (G_MODULE_SUFFIX);
 	g_assert (ext_len > 0);
 
@@ -396,30 +396,30 @@
 		return FALSE;
 	}
 	
-	dir = opendir (dir_path);
+	dir = g_dir_open (dir_path, 0, NULL);
 	if (!dir) {
 		/* Not an error. since modules are optional */
 		return TRUE;
 	}
 
-	while ((entry = readdir (dir)) != NULL) {
+	while ((entry = g_dir_read_name (dir)) != NULL) {
 		gchar *path;
 		gint len;
 
-		len = strlen (entry->d_name);
+		len = strlen (entry);
 
 		if (len < ext_len + 2) /* 2 = one char + 1 for '.'*/
 			continue;
 
-		if (*(entry->d_name + len - ext_len - 1) != '.' || 
-		    strcmp (entry->d_name + len - ext_len, G_MODULE_SUFFIX))
+		if (*(entry + len - ext_len - 1) != '.' || 
+		    strcmp (entry + len - ext_len, G_MODULE_SUFFIX))
 			continue;
 		
-		path = g_build_filename (dir_path, entry->d_name, NULL);
+		path = g_build_filename (dir_path, entry, NULL);
 		gpa_printer_list_load_from_module (printers, path);
 		g_free (path);
 	}
-	closedir (dir);
+	g_dir_close (dir);
 	
 	return TRUE;
 }
@@ -436,26 +436,26 @@
 static gboolean
 gpa_printer_list_load_from_dir (GPAList *printers, const gchar *dir_name)
 {
-	struct dirent *entry;
-	DIR *dir;
+	const char *entry;
+	GDir *dir;
 
-	dir = opendir (dir_name);
+	dir = g_dir_open (dir_name, 0, NULL);
 	if (!dir)
 		return FALSE;
 
-	while ((entry = readdir (dir))) {
+	while ((entry = g_dir_read_name (dir))) {
 		GPANode *printer;
 		gchar *file;
 		gint len;
 
-		len = strlen (entry->d_name);
+		len = strlen (entry);
 		if (len < 5)
 			continue;
 		
-		if (strcmp (entry->d_name + len - 4, ".xml"))
+		if (strcmp (entry + len - 4, ".xml"))
 			continue;
 
-		file = g_build_filename (dir_name, entry->d_name, NULL);
+		file = g_build_filename (dir_name, entry, NULL);
 		printer = gpa_printer_new_from_file (file);
 		g_free (file);
 
@@ -467,7 +467,7 @@
 		if (strcmp (GPA_NODE_ID (printer), "GENERIC") == 0)
 		    gpa_list_set_default (printers, printer);
 	}
-	closedir (dir);
+	g_dir_close (dir);
 
 	return TRUE;
 }
@@ -487,6 +487,7 @@
 {
 	GPAList *printers;
 	GPANode *p;
+	gchar   *path;
 
 	if (gpa_root && gpa_root->printers != NULL) {
 		g_warning ("gpa_printer_list_load should only be called once");
@@ -495,7 +496,9 @@
 
 	printers = gpa_list_new (GPA_TYPE_PRINTER, "Printers", TRUE);
 
-	gpa_printer_list_load_from_dir        (printers, GPA_DATA_DIR "/printers");
+	path = g_build_filename (GPA_DATA_DIR, "printers", NULL);
+	gpa_printer_list_load_from_dir        (printers, path);
+	g_free (path);
 	gpa_printer_list_load_from_module_dir (printers, GPA_MODULES_DIR);
 
 	if (GPA_NODE (printers)->children == NULL) {
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/gpa/makefile.msc my-gtk/libgnomeprint/libgnomeprint/gpa/makefile.msc
--- from-cvs/libgnomeprint/libgnomeprint/gpa/makefile.msc	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/gpa/makefile.msc	Sun Nov 14 18:17:20 2004
@@ -0,0 +1,64 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..
+PRJ_TOP = ..\..
+PACKAGE = gpa
+PKG_VER = 
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+DEFINES = -DWE_ARE_LIBGNOMEPRINT_INTERNALS
+INCLUDES = -I $(PRJ_TOP) -I.. $(GLIB_CFLAGS) $(LIBXML2_CFLAGS)
+
+OBJECTS = \
+	gpa-node.obj \
+	gpa-list.obj \
+	gpa-reference.obj \
+	gpa-model.obj \
+	gpa-option.obj \
+	gpa-printer.obj \
+	gpa-root.obj \
+	gpa-config.obj \
+	gpa-key.obj \
+	gpa-state.obj \
+	gpa-settings.obj \
+	gpa-utils.obj \
+
+libgpaincdir = \
+	$(includedir)/libgnomeprint-2.2/libgnomeprint/private
+
+libgpainc_HEADERS = \
+	gpa-node.h \
+	gpa-utils.h \
+	gpa-printer.h \
+	gpa-key.h \
+	gpa-state.h \
+	gpa-option.h \
+	gpa-node-private.h \
+	gpa-list.h \
+	gpa-model.h \
+	gpa-settings.h \
+	gpa-reference.h \
+	gpa-root.h \
+	gpa-config.h
+
+all : \
+	$(PRJ_TOP)\config.h \
+	$(PACKAGE).lib
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/makefile.msc my-gtk/libgnomeprint/libgnomeprint/makefile.msc
--- from-cvs/libgnomeprint/libgnomeprint/makefile.msc	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/makefile.msc	Fri Nov 19 13:06:32 2004
@@ -0,0 +1,231 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..
+PRJ_TOP = ..
+PACKAGE = gnome-print
+PKG_VER = 2.8
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+DEFINES = -DWE_ARE_LIBGNOMEPRINT_INTERNALS
+INCLUDES = -I $(PRJ_TOP) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE2_CFLAGS) \
+	$(LIBART_CFLAGS) $(LIBXML2_CFLAGS) $(PNG_CFLAGS)
+
+PKG_LINK = \
+	$(GLIB_LIBS) $(INTL_LIBS) $(PANGOWIN32_LIBS) \
+	$(PANGOFT2_LIBS) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
+	$(LIBART_LIBS) $(LIBXML2_LIBS) \
+	$(PNG_LIBS) \
+	gpa\gpa.lib ttsubset\ttsubset.lib
+
+SUBDIRS = gpa ttsubset transports modules
+
+sub-all: 
+	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one:
+	cd $(THIS)
+	nmake -nologo -f makefile.msc
+	cd ..
+
+libgnomeprint_2_2_la_LIBADD = \
+	$(LIBGNOMEPRINT_LIBS) gpa/libgpa.la ttsubset/libttsubset.la
+
+libgnomeprintinc_HEADERS = \
+	$(nox_headers) $(font_headers) libgnomeprint-enum-types.h
+
+CLEANFILES = \
+	$(marshal_sources) \
+	$(enum_sources) \
+	s-enum-types-h \
+	s-enum-types-c
+
+font_headers = \
+	gnome-font.h gnome-font-face.h gnome-rfont.h
+
+OBJECTS = \
+        art_rgba_rgba_affine.obj \
+        art_rgba_svp.obj \
+        gnome-font-face.obj \
+        gnome-font-family.obj \
+        gnome-font.obj \
+        gnome-fontmap.obj \
+        gnome-glyphlist.obj \
+        gnome-pgl.obj \
+        gnome-print-config.obj \
+        gnome-print-encode.obj \
+        gnome-print-frgba.obj \
+        gnome-print-i18n.obj \
+        gnome-print-job.obj \
+        gnome-print-meta.obj \
+        gnome-print-multipage.obj \
+        gnome-print-pango.obj \
+        gnome-print-paper.obj \
+        gnome-print-pdf-t1.obj \
+        gnome-print-pdf-tt.obj \
+        gnome-print-pdf.obj \
+        gnome-print-ps2.obj \
+        gnome-print-rbuf.obj \
+        gnome-print-rgbp.obj \
+        gnome-print-stdapi.obj \
+        gnome-print-svg.obj \
+        gnome-print-transport.obj \
+        gnome-print-unit.obj \
+        gnome-print.obj \
+        gnome-rfont.obj \
+        gp-gc.obj \
+        gp-path.obj \
+        libgnomeprint-marshal-main.obj \
+
+nox_headers = \
+	gnome-print-config.h \
+	gnome-print.h \
+	gp-gc.h \
+	gnome-print-job.h \
+	gnome-print-pango.h \
+	gnome-glyphlist.h \
+	gnome-pgl.h \
+	gnome-print-paper.h \
+	gnome-print-unit.h
+
+temp_sources = \
+	art_rgb_affine_private.h \
+	art_rgba_rgba_affine.c \
+	art_rgba_rgba_affine.h \
+	art_rgba_svp.c \
+	art_rgba_svp.h
+
+EXTRA_DIST = \
+	libgnomeprint-2.2.pc.in \
+	libgnomeprint-2.2-uninstalled.pc.in \
+	libgnomeprint-marshal.list \
+	gnome-print-svg.c \
+	gnome-print-svg.h
+
+font_sources = \
+	gnome-fontmap.c \
+	gnome-font.c \
+	gnome-font-face.c \
+	gnome-rfont.c \
+	gnome-font-family.c \
+	gnome-font-family.h
+
+lib_LTLIBRARIES = \
+	libgnomeprint-2-2.la
+
+font_private_headers = \
+	gnome-font-private.h gnome-fontmap.h
+
+DONT_DIST_SOURCE = \
+	$(marshal_sources) $(enum_sources)
+
+libgnomeprint_2_2_la_LDFLAGS = \
+	-no-undefined
+
+nox_sources = \
+	gnome-print-private.h \
+	gnome-print.c \
+	gnome-print-stdapi.c \
+	gnome-print-config.c \
+	gnome-print-config.h \
+	gnome-print-config-private.h \
+	gnome-print-meta.c \
+	gnome-print-meta.h \
+	gnome-print-job.c \
+	gnome-print-job-private.h \
+	gnome-print-multipage.c \
+	gnome-print-multipage.h \
+	gnome-print-ps2.c \
+	gnome-print-ps2.h \
+	gnome-print-pdf.c \
+	gnome-print-pdf.h \
+	gnome-print-pdf-private.h \
+	gnome-print-pdf-t1.c \
+	gnome-print-pdf-tt.c \
+	gnome-print-pango.c \
+	gnome-print-module.h \
+	gnome-print-rbuf.c \
+	gnome-print-rbuf.h \
+	gnome-print-frgba.c \
+	gnome-print-frgba.h \
+	gnome-print-rgbp.c \
+	gnome-print-rgbp.h \
+	gnome-print-transport.c \
+	gnome-print-transport.h \
+	gnome-print-i18n.c \
+	gnome-print-i18n.h \
+	gp-path.c \
+	gp-path.h \
+	gp-gc.c \
+	gnome-glyphlist.c \
+	gnome-pgl.c \
+	gnome-pgl-private.h \
+	gnome-print-encode.c \
+	gnome-print-encode.h \
+	libgnomeprint-enum-types.c \
+	gnome-print-unit.c \
+	gnome-print-paper.c
+
+AM_LDFLAGS = \
+	-version-info $(GNOMEPRINT_CURRENT):$(GNOMEPRINT_REVISION):$(GNOMEPRINT_AGE)
+
+pkgconfig_DATA = \
+	libgnomeprint-2.2.pc
+
+enum_sources = \
+	libgnomeprint-enum-types.c libgnomeprint-enum-types.h
+
+libgnomeprintprivateinc_HEADERS = \
+	$(nox_private_headers) $(font_private_headers)
+
+pkgconfigdir = \
+	$(libdir)/pkgconfig
+
+libgnomeprint-marshal.h: Makefile.am libgnomeprint-marshal.list
+	$(GLIB)\gobject\glib-genmarshal --prefix=libgnomeprint_marshal libgnomeprint-marshal.list --header > xgen-gmh \
+	&& (fc -s xgen-gmh libgnomeprint-marshal.h || copy xgen-gmh libgnomeprint-marshal.h) \
+	&& del xgen-gmh xgen-gmh~
+
+libgnomeprint-marshal.c: Makefile.am libgnomeprint-marshal.list
+	$(GLIB)\gobject\glib-genmarshal --prefix=libgnomeprint_marshal libgnomeprint-marshal.list --body > xgen-gmc \
+	&& copy xgen-gmc libgnomeprint-marshal.c \
+	&& del xgen-gmc xgen-gmc~ 
+
+libgnomeprintincdir = \
+	$(includedir)/libgnomeprint-2.2/libgnomeprint
+
+nox_private_headers = \
+	gnome-glyphlist-private.h \
+	gnome-print-private.h \
+	gnome-print-config-private.h \
+	gp-gc-private.h
+
+marshal_sources = \
+	libgnomeprint-marshal.c libgnomeprint-marshal.h
+
+libgnomeprintprivateincdir = \
+	$(libgnomeprintincdir)/private
+
+all : \
+	$(PRJ_TOP)\config.h \
+	sub-all \
+	libgnomeprint-marshal.h \
+	libgnomeprint-marshal.c \
+	$(PACKAGE)-$(PKG_VER).dll
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def $(PKG_LINK)
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/modules/makefile.msc my-gtk/libgnomeprint/libgnomeprint/modules/makefile.msc
--- from-cvs/libgnomeprint/libgnomeprint/modules/makefile.msc	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/modules/makefile.msc	Fri Nov 19 13:08:36 2004
@@ -0,0 +1,51 @@
+# autogenerated from automake.am with automake.py
+!IFNDEF PACKAGE
+TOP = ..\..\..
+PRJ_TOP = ..\..
+!ELSE
+TOP = ..\..\..\..
+PRJ_TOP = ..\..\..
+!ENDIF
+PKG_VER = 2.8
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+MODULES = win32 lpd #papi cups
+
+DEFINES = -DWE_ARE_LIBGNOMEPRINT_INTERNALS
+INCLUDES = -I $(PRJ_TOP) -I.. $(GLIB_CFLAGS) $(LIBXML2_CFLAGS)
+PKG_LINK = $(GLIB_LIBS) $(PRJ_TOP)\libgnomeprint\gnome-print-$(PKG_VER).lib
+
+sub-all: 
+	for %d in ($(MODULES)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one:
+	cd $(THIS)
+	nmake -nologo -f ..\makefile.msc libgnome-print-$(THIS).dll PACKAGE=$(THIS) OBJECTS=gnome-print-$(THIS).obj
+	cd ..
+
+all : \
+	$(PRJ_TOP)\config.h \
+	sub-all
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+libgnome-print-$(PACKAGE).dll : $(OBJECTS)
+	$(CC) $(CFLAGS) -LD -Felibgnome-print-$(PACKAGE).dll $(OBJECTS) \
+	$(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS)
+
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/modules/win32/gnome-print-win32.c my-gtk/libgnomeprint/libgnomeprint/modules/win32/gnome-print-win32.c
--- from-cvs/libgnomeprint/libgnomeprint/modules/win32/gnome-print-win32.c	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/modules/win32/gnome-print-win32.c	Fri Nov 19 12:44:38 2004
@@ -0,0 +1,176 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  gnome-print-win32.c: A win32 backend based on lpd
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License
+ *  as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useoful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Authors:
+ *   Andreas J. Guelzow <aguelzow@taliesin.ca>
+ *   Hans Breuer <hans@breuer.org>
+ *
+ *  Copyright 2004 Andreas J. Guelzow
+ *  Copyright 2004 Hans Breuer
+ *
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <gmodule.h>
+#include <locale.h>
+#include <string.h>
+
+#include <libgnomeprint/gnome-print-module.h>
+#include <libgnomeprint/gpa/gpa-model.h>
+#include <libgnomeprint/gpa/gpa-printer.h>
+#include <libgnomeprint/gpa/gpa-option.h>
+#include <libgnomeprint/gpa/gpa-settings.h>
+#include <libgnomeprint/gpa/gpa-state.h>
+#include <libgnomeprint/gpa/gpa-utils.h>
+
+#include "libgnomeprint/gnome-print-i18n.h"
+
+#include <windows.h>
+
+/* Argument order: id  printer */
+
+xmlChar *win32_model_unknown_xml_template = 
+"<?xml version=\"1.0\"?>"
+"<Model Id=\"%s\" Version=\"1.0\">"
+"  <Name>Unavailable PPD File</Name>"
+"  <ModelVersion>0.0.1</ModelVersion>"
+"  <Options>"
+"    <Option Id=\"Transport\">"
+"      <Option Id=\"Backend\" Type=\"List\" Default=\"libgnomeprint-win32\">"
+"        <Item Id=\"Win32\">"
+"          <Name>Win32</Name>"
+"          <Key Id=\"Module\" Value=\"libgnomeprint-win32\"/>"
+"          <Key Id=\"Printer\" Value=\"%s\"/>"
+"        </Item>"
+"      </Option>"
+"    </Option>"
+"    <Option Id=\"Output\">"
+"      <Option Id=\"Media\">"
+"        <Option Id=\"PhysicalSize\" Type=\"List\" Default=\"A4\">"
+"          <Fill Ref=\"Globals.Media.PhysicalSize\"/>"
+"        </Option>"
+"        <Option Id=\"PhysicalOrientation\" Type=\"List\" Default=\"R0\">"
+"          <Fill Ref=\"Globals.Media.PhysicalOrientation\"/>"
+"        </Option>"
+"        <Key Id=\"Margins\">"
+"          <Key Id=\"Left\" Value=\"0\"/>"
+"          <Key Id=\"Right\" Value=\"0\"/>"
+"          <Key Id=\"Top\" Value=\"0\"/>"
+"          <Key Id=\"Bottom\" Value=\"0\"/>"
+"        </Key>"
+"      </Option>"
+"      <Option Id=\"Job\">"
+"        <Option Id=\"NumCopies\" Type=\"String\" Default=\"1\"/>"
+"        <Option Id=\"NonCollatedCopiesHW\" Type=\"String\" Default=\"true\"/>"
+"        <Option Id=\"CollatedCopiesHW\" Type=\"String\" Default=\"false\"/>"
+"        <Option Id=\"Collate\" Type=\"String\" Default=\"false\"/>"
+"        <Option Id=\"Duplex\" Type=\"String\" Default=\"true\"/>"
+"        <Option Id=\"Tumble\" Type=\"String\" Default=\"false\"/>"
+"        <Option Id=\"PrintToFile\" Type=\"String\" Default=\"true\" Locked=\"true\"/>"
+"        <Option Id=\"FileName\" Type=\"String\" Default=\"output.ps\"/>"
+"      </Option>"
+"    </Option>"
+"  </Options>"
+"</Model>";
+
+static gboolean
+append_printer (GPAList *printers_list,  const char *name, 
+		gboolean is_default)
+{
+	GPANode *settings = NULL;
+	GPANode *printer  = NULL;
+	GPANode *model    = NULL;
+	gboolean retval = FALSE;
+	char *xml;
+	gchar *description = NULL;
+	gchar *id = NULL;
+
+	model = gpa_model_get_by_id ("win32-unknown-unknown", TRUE);
+	
+	if (model == NULL) {
+		xml = g_strdup_printf (win32_model_unknown_xml_template, 
+				       "win32-unknown-unknown", name);
+		model = gpa_model_new_from_xml_str (xml);
+		g_free (xml);
+	}
+
+	if (model == NULL)
+		return FALSE;
+
+	settings = gpa_settings_new (GPA_MODEL (model), "Default", "SettIdFromWin32");
+	if (settings == NULL) 
+		goto append_printer_exit;
+
+	description = g_strdup_printf (_("%s (via lpr)"), name);
+	id = g_strdup_printf ("Win32::%s", name);
+	printer = gpa_printer_new (id, description, GPA_MODEL (model), GPA_SETTINGS (settings));
+	g_free (description);
+	g_free (id);
+
+	if (printer == NULL)
+		goto append_printer_exit;
+
+	if (gpa_node_verify (printer)) {
+		gpa_list_prepend (printers_list, printer);
+		if (is_default)
+			gpa_list_set_default (printers_list, printer);
+		retval = TRUE;
+	}
+
+ append_printer_exit:
+	if (retval == FALSE) {
+		g_warning ("The win32 printer %s could not be created\n", name);
+
+		my_gpa_node_unref (printer);
+		my_gpa_node_unref (GPA_NODE (model));
+		my_gpa_node_unref (settings);
+	}
+
+	return retval;
+}
+
+static void
+gnome_print_win32_printer_list_append (gpointer printers_list, 
+				      const gchar *path)
+{
+
+	static char sName[1024];
+	GetProfileString("windows", "device", "", sName, sizeof(sName));
+	if (strchr (sName, ','))
+		*strchr (sName, ',') = 0;
+	else if ( strlen (sName) < 1)
+		strcpy (sName, "unknown");
+
+
+	append_printer (GPA_LIST (printers_list), sName, FALSE);
+}
+
+
+
+
+
+/*  ------------- GPA init ------------- */
+G_MODULE_EXPORT gboolean gpa_module_init (GpaModuleInfo *info);
+
+G_MODULE_EXPORT gboolean
+gpa_module_init (GpaModuleInfo *info)
+{
+	info->printer_list_append = gnome_print_win32_printer_list_append;
+	return TRUE;
+}
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-custom.c my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-custom.c
--- from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-custom.c	Wed Dec 18 02:56:24 2002
+++ my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-custom.c	Fri Nov 19 13:08:06 2004
@@ -33,6 +33,12 @@
 #include <libgnomeprint/gnome-print.h>
 #include "gp-transport-custom.h"
 
+#ifdef G_OS_WIN32
+#include <stdio.h>
+#define popen(f,m) _popen(f,m)
+#define pclose(f) _pclose(f)
+#endif
+
 static void gp_transport_custom_class_init (GPTransportCustomClass *klass);
 static void gp_transport_custom_init (GPTransportCustom *tcustom);
 
@@ -145,7 +151,7 @@
 		command = g_strdup ("lpr");
 	}
 
-	tcustom->pipe = popen (command, "w");
+	tcustom->pipe = popen (command, "wb");
 
 	if (tcustom->pipe == NULL) {
 		g_warning ("Opening '%s' for output failed", command);
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-file.c my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-file.c
--- from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-file.c	Wed Jun 16 20:42:53 2004
+++ my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-file.c	Thu Nov 18 09:21:24 2004
@@ -32,8 +32,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <libgnomeprint/gnome-print.h>
+#include <gmodule.h>
+
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 #include "gp-transport-file.h"
 
@@ -47,7 +54,7 @@
 static gint gp_transport_file_close (GnomePrintTransport *transport);
 static gint gp_transport_file_write (GnomePrintTransport *transport, const guchar *buf, gint len);
 
-GType gnome_print__transport_get_type (void);
+G_MODULE_EXPORT GType gnome_print__transport_get_type (void);
 
 static GnomePrintTransportClass *parent_class = NULL;
 
@@ -144,8 +151,8 @@
 
 	g_return_val_if_fail (tf->name != NULL, GNOME_PRINT_ERROR_UNKNOWN);
 
-#if defined(G_OS_WIN32) && defined(__MINGW32__)
-	tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY);
+#if defined(G_OS_WIN32) && (defined(__MINGW32__) || defined _MSC_VER)
+	tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY);
 #else
 	tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 #endif
@@ -202,7 +209,7 @@
 	return len;
 }
 
-GType
+G_MODULE_EXPORT GType
 gnome_print__transport_get_type (void)
 {
 	return GP_TYPE_TRANSPORT_FILE;
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-lpr.c my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-lpr.c
--- from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-lpr.c	Sat Aug 21 05:31:35 2004
+++ my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-lpr.c	Mon Nov 15 00:01:11 2004
@@ -30,9 +30,16 @@
 
 #include "config.h"
 #include <libgnomeprint/gnome-print.h>
+#include <gmodule.h>
 
 #include "gp-transport-lpr.h"
 
+#ifdef G_OS_WIN32
+#include <stdio.h>
+#define popen(f,m) _popen(f,m)
+#define pclose(f) _pclose(f)
+#endif
+
 static void gp_transport_lpr_class_init (GPTransportLPRClass *klass);
 static void gp_transport_lpr_init (GPTransportLPR *tlpr);
 
@@ -43,7 +50,7 @@
 static gint gp_transport_lpr_close (GnomePrintTransport *transport);
 static gint gp_transport_lpr_write (GnomePrintTransport *transport, const guchar *buf, gint len);
 
-GType gnome_print__transport_get_type (void);
+G_MODULE_EXPORT GType gnome_print__transport_get_type (void);
 
 static GnomePrintTransportClass *parent_class = NULL;
 
@@ -207,7 +214,7 @@
 	return len;
 }
 
-GType
+G_MODULE_EXPORT GType
 gnome_print__transport_get_type (void)
 {
 	return GP_TYPE_TRANSPORT_LPR;
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-win32.c my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-win32.c
--- from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-win32.c	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-win32.c	Mon Nov 15 00:08:23 2004
@@ -0,0 +1,249 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  gp-transport-file.c: WIN32 transport destination
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License
+ *  as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Authors:
+ *    Raph Levien <raph@acm.org>
+ *    Miguel de Icaza <miguel@kernel.org>
+ *    Lauris Kaplinski <lauris@ximian.com>
+ *    Chema Celorio <chema@celorio.com>
+ *    Hans Breuer <hans@breuer.og>
+ *
+ *  Copyright (C) 1999-2001 Ximian Inc. and authors
+ *  Copyright (C) 2004 Hans Breuer
+ *
+ */
+
+#define __GP_TRANSPORT_WIN32_C__
+
+#include "config.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <libgnomeprint/gnome-print.h>
+#include <gmodule.h>
+
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
+
+#include "gp-transport-win32.h"
+
+static void gp_transport_win32_class_init (GPTransportWin32Class *klass);
+static void gp_transport_win32_init (GPTransportWin32 *tf);
+
+static void gp_transport_win32_finalize (GObject *object);
+
+static gint gp_transport_win32_construct (GnomePrintTransport *transport);
+static gint gp_transport_win32_open (GnomePrintTransport *transport);
+static gint gp_transport_win32_close (GnomePrintTransport *transport);
+static gint gp_transport_win32_write (GnomePrintTransport *transport, const guchar *buf, gint len);
+
+G_MODULE_EXPORT GType gnome_print__transport_get_type (void);
+
+static GnomePrintTransportClass *parent_class = NULL;
+
+GType
+gp_transport_win32_get_type (void)
+{
+	static GType type = 0;
+	if (!type) {
+		static const GTypeInfo info = {
+			sizeof (GPTransportWin32Class),
+			NULL, NULL,
+			(GClassInitFunc) gp_transport_win32_class_init,
+			NULL, NULL,
+			sizeof (GPTransportWin32),
+			0,
+			(GInstanceInitFunc) gp_transport_win32_init
+		};
+		type = g_type_register_static (GNOME_TYPE_PRINT_TRANSPORT, "GPTransportWin32", &info, 0);
+	}
+	return type;
+}
+
+static void
+gp_transport_win32_class_init (GPTransportWin32Class *klass)
+{
+	GObjectClass *object_class;
+	GnomePrintTransportClass *transport_class;
+
+	object_class = (GObjectClass *) klass;
+	transport_class = (GnomePrintTransportClass *) klass;
+
+	parent_class = g_type_class_peek_parent (klass);
+
+	object_class->finalize = gp_transport_win32_finalize;
+
+	transport_class->construct = gp_transport_win32_construct;
+	transport_class->open = gp_transport_win32_open;
+	transport_class->close = gp_transport_win32_close;
+	transport_class->write = gp_transport_win32_write;
+}
+
+static void
+gp_transport_win32_init (GPTransportWin32 *tf)
+{
+	tf->name = NULL;
+	tf->hPrinter = NULL;
+	tf->pJob = NULL;
+	tf->hFile = NULL;
+}
+
+static void
+gp_transport_win32_finalize (GObject *object)
+{
+	GPTransportWin32 *tf;
+
+	tf = GP_TRANSPORT_WIN32 (object);
+
+	if (tf->hFile) {
+		CloseHandle (tf->hFile);
+		tf->hFile = NULL;
+		g_warning ("Destroying GPTransportWin32 with open win32 file descriptor");
+	}
+	if (tf->hPrinter) {
+		CloseHandle (tf->hPrinter);
+		tf->hPrinter;
+		g_warning ("Destroying GPTransportWin32 with open win32 printer descriptor");
+	}
+
+	if (tf->pJob) {
+		/* shouldn't Schedule here ? */
+		tf->pJob = NULL;
+	}
+	if (tf->name) {
+		g_free (tf->name);
+		tf->name = NULL;
+	}
+
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint
+gp_transport_win32_construct (GnomePrintTransport *transport)
+{
+	GPTransportWin32 *tf;
+	guchar *value;
+
+	tf = GP_TRANSPORT_WIN32 (transport);
+
+	value = gnome_print_config_get (transport->config, "Settings.Output.Job.Win32Name");
+
+	if (!value) {
+		g_warning ("Configuration does not specify win32name");
+		return GNOME_PRINT_ERROR_UNKNOWN;
+	}
+		
+	tf->name = value;
+
+	return GNOME_PRINT_OK;
+}
+
+static gint
+gp_transport_win32_open (GnomePrintTransport *transport)
+{
+	GPTransportWin32 *tf;
+	DWORD dwSizeRequired;
+
+	tf = GP_TRANSPORT_WIN32 (transport);
+
+	g_return_val_if_fail (tf->name != NULL, GNOME_PRINT_ERROR_UNKNOWN);
+
+	if (!OpenPrinter (tf->name, &tf->hPrinter, NULL))
+		tf->hPrinter = NULL;
+	else {
+		tf->pJob = (ADDJOB_INFO_1 *) g_new (BYTE, _MAX_PATH*2);
+		if (!AddJob (tf->hPrinter, 1, (BYTE*)tf->pJob, _MAX_PATH*2, &dwSizeRequired)) {
+			g_warning ("ADDJOB_INFO_1 too small -> %d", dwSizeRequired);
+			g_free (tf->pJob);
+			tf->pJob = NULL;
+		}
+	}
+	if (!tf->hPrinter || !tf->pJob) {
+		g_warning ("Opening win32 %s for output failed", tf->name);
+		return GNOME_PRINT_ERROR_UNKNOWN;
+	}
+	tf->hFile = CreateFile (tf->pJob->Path, 
+                              GENERIC_WRITE, 
+                              0,      /* no share */
+                              NULL,   /* default security */
+                              OPEN_ALWAYS,
+                              FILE_ATTRIBUTE_NORMAL,
+                              NULL); /* template */
+	if (tf->hFile == INVALID_HANDLE_VALUE) {
+		g_warning ("Spool file [%s] creation failed.", tf->pJob->Path);
+		/* GetLastError() would offer more information ;( */
+		return GNOME_PRINT_ERROR_UNKNOWN;
+	}
+
+	return GNOME_PRINT_OK;
+}
+
+static gint
+gp_transport_win32_close (GnomePrintTransport *transport)
+{
+	GPTransportWin32 *tf;
+
+	tf = GP_TRANSPORT_WIN32 (transport);
+
+	g_return_val_if_fail (tf->hPrinter, GNOME_PRINT_ERROR_UNKNOWN);
+
+	if (!tf->pJob || !ScheduleJob (tf->hPrinter, tf->pJob->JobId)) {
+		g_warning ("Closing output win32 failed [%s]", tf->name);
+		tf->pJob = NULL;
+		return GNOME_PRINT_ERROR_UNKNOWN;
+	}
+	tf->pJob = NULL;
+	CloseHandle (tf->hFile);
+	tf->hFile = NULL;
+	CloseHandle (tf->hPrinter);
+	tf->hPrinter = NULL;
+	return GNOME_PRINT_OK;
+}
+
+static gint
+gp_transport_win32_write (GnomePrintTransport *transport, const guchar *buf, gint len)
+{
+	GPTransportWin32 *tf;
+	guint32 l, written;
+
+	tf = GP_TRANSPORT_WIN32 (transport);
+
+	g_return_val_if_fail (tf->hPrinter, GNOME_PRINT_ERROR_UNKNOWN);
+
+	l = len;
+	while (l > 0) {
+		if (!WriteFile (tf->hFile, buf, len, &written, NULL)) {
+			g_warning ("Writing output win32 failed");
+			return GNOME_PRINT_ERROR_UNKNOWN;
+		}
+		buf += written;
+		l -= written;
+	}
+
+	return len;
+}
+
+G_MODULE_EXPORT GType
+gnome_print__transport_get_type (void)
+{
+	return GP_TYPE_TRANSPORT_WIN32;
+}
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-win32.h my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-win32.h
--- from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-win32.h	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-win32.h	Mon Nov 15 00:01:53 2004
@@ -0,0 +1,54 @@
+#ifndef __GP_TRANSPORT_WIN32_H__
+#define __GP_TRANSPORT_WIN32_H__
+
+/*
+ * Win32 transport destination
+ *
+ * Authors:
+ *   Raph Levien (raph@acm.org)
+ *   Miguel de Icaza (miguel@kernel.org)
+ *   Lauris Kaplinski <lauris@ximian.com>
+ *   Chema Celorio (chema@celorio.com)
+ *   Carlos Perelló Marín <carlos@gnome-db.org>
+ *   Hans Breuer <hans@breuer.og>
+ *
+ * Copyright (C) 1999-2001 Ximian, Inc. and authors
+ * Copyright (C) 2004 Hans Breuer
+ *
+ */
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#define GP_TYPE_TRANSPORT_WIN32 (gp_transport_win32_get_type ())
+#define GP_TRANSPORT_WIN32(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GP_TYPE_TRANSPORT_WIN32, GPTransportWin32))
+#define GP_TRANSPORT_WIN32_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GP_TYPE_TRANSPORT_WIN32, GPTransportWin32Class))
+#define GP_IS_TRANSPORT_WIN32(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GP_TYPE_TRANSPORT_WIN32))
+#define GP_IS_TRANSPORT_WIN32_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GP_TYPE_TRANSPORT_WIN32))
+#define GP_TRANSPORT_WIN32_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GP_TYPE_TRANSPORT_WIN32, GPTransportWin32Class))
+
+typedef struct _GPTransportWin32 GPTransportWin32;
+typedef struct _GPTransportWin32Class GPTransportWin32Class;
+
+#include <stdio.h>
+#include "../gnome-print-transport.h"
+#include <windows.h>
+
+struct _GPTransportWin32 {
+	GnomePrintTransport transport;
+	gchar              *name;
+	HANDLE              hPrinter;
+	ADDJOB_INFO_1      *pJob;
+	HANDLE              hFile;
+};
+
+struct _GPTransportWin32Class {
+	GnomePrintTransportClass parent_class;
+};
+
+GType gp_transport_win32_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/transports/makefile.msc my-gtk/libgnomeprint/libgnomeprint/transports/makefile.msc
--- from-cvs/libgnomeprint/libgnomeprint/transports/makefile.msc	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/transports/makefile.msc	Mon Nov 15 00:10:24 2004
@@ -0,0 +1,50 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..
+PRJ_TOP = ..\..
+PKG_VER = 2.8
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+MODULES = custom file lpr win32
+
+sub-all: 
+	for %d in ($(MODULES)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one:
+	nmake -nologo -f makefile.msc libgnomeprint-$(THIS).dll PACKAGE=$(THIS) OBJECTS=gp-transport-$(THIS).obj
+
+DEFINES = -DWE_ARE_LIBGNOMEPRINT_INTERNALS
+INCLUDES = \
+	-I$(PRJ_TOP) $(GLIB_CFLAGS) \
+	$(PANGO_CFLAGS) $(LIBART_CFLAGS) \
+	$(LIBGNOMEPRINT_CFLAGS)
+
+PKG_LINK = \
+	$(GLIB_LIBS) \
+	..\gnome-print-$(PKG_VER).lib 
+
+all : \
+	$(PRJ_TOP)\config.h \
+	sub-all
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+libgnomeprint-$(PACKAGE).dll : $(OBJECTS)
+	$(CC) $(CFLAGS) -LD -Felibgnomeprint-$(PACKAGE).dll $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib wsock32.lib winspool.lib $(LDFLAGS)
+
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/ttsubset/gnome-print-tt-subset.c my-gtk/libgnomeprint/libgnomeprint/ttsubset/gnome-print-tt-subset.c
--- from-cvs/libgnomeprint/libgnomeprint/ttsubset/gnome-print-tt-subset.c	Wed Sep 08 23:11:04 2004
+++ my-gtk/libgnomeprint/libgnomeprint/ttsubset/gnome-print-tt-subset.c	Thu Nov 18 09:34:16 2004
@@ -63,7 +63,7 @@
     }
 
     *subfont_file = tmpnam (NULL);
-    subf = fopen (*subfont_file, "w");
+    subf = fopen (*subfont_file, "wb");
     CreateT42FromTTGlyphs (fnt, subf, encoded_font_name, (uint16 *)glyphArray, (byte *)encoding, len);
     fclose (subf);
 
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/ttsubset/makefile.msc my-gtk/libgnomeprint/libgnomeprint/ttsubset/makefile.msc
--- from-cvs/libgnomeprint/libgnomeprint/ttsubset/makefile.msc	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/libgnomeprint/ttsubset/makefile.msc	Sat Nov 13 23:50:55 2004
@@ -0,0 +1,40 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..
+PRJ_TOP = ..\..
+PACKAGE = ttsubset
+PKG_VER = 
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+
+DEFINES = -DWE_ARE_LIBGNOMEPRINT_INTERNALS -DNO_MAPPERS
+INCLUDES = -I . -I $(PRJ_TOP) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(LIBART_CFLAGS)
+
+OBJECTS = \
+	sft.obj \
+	list.obj \
+	ttcr.obj \
+	crc32.obj \
+	gnome-print-tt-subset.obj \
+
+all : \
+	$(PRJ_TOP)\config.h \
+	$(PACKAGE).lib
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/ttsubset/sft.c my-gtk/libgnomeprint/libgnomeprint/ttsubset/sft.c
--- from-cvs/libgnomeprint/libgnomeprint/ttsubset/sft.c	Fri Sep 10 19:59:06 2004
+++ my-gtk/libgnomeprint/libgnomeprint/ttsubset/sft.c	Thu Nov 18 09:33:05 2004
@@ -950,7 +950,7 @@
 #ifdef DEBUG3
     {
         int i;
-        FILE *out = fopen("points.dat", "a");
+        FILE *out = fopen("points.dat", "ab");
         assert(out != 0);
         fprintf(out, "Glyph: %d\nPoints: %d\n", glyphID, res);
         for (i=0; i<res; i++) {
@@ -1628,7 +1628,7 @@
 {
     int nFonts = 0;
     byte buffer[12];
-    int fd = open(fname, O_RDONLY);
+    int fd = open(fname, O_RDONLY | O_BINARY);
     if( fd != -1 ) {
         if (read(fd, buffer, 12) == 12) {
             if(GetUInt32(buffer, 0, 1) == T_ttcf )
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/ttsubset/sft.h my-gtk/libgnomeprint/libgnomeprint/ttsubset/sft.h
--- from-cvs/libgnomeprint/libgnomeprint/ttsubset/sft.h	Fri Sep 10 19:59:06 2004
+++ my-gtk/libgnomeprint/libgnomeprint/ttsubset/sft.h	Sat Nov 13 23:50:07 2004
@@ -77,7 +77,9 @@
 #define __SUBFONT_H
 
 #include <sys/types.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #ifndef NO_LIST
 #include "list.h"
@@ -150,6 +152,21 @@
 /*@}*/
 
 #ifndef STSF
+#  ifdef _MSC_VER
+/* glib already deals with differnt compilers */
+#include <glibconfig.h>
+
+typedef guchar     byte;
+typedef guchar     uint8;
+typedef gchar      int8;
+typedef guint16    uint16;
+typedef gint16     int16;
+
+typedef guint32    uint32;
+typedef gint32     int32;
+typedef guint64    uint64;
+typedef gint64     int64;
+#  else
 /*- XXX These should be dynamically configured */ /*FOLD00*/
     typedef unsigned char         byte;
     typedef unsigned char         uint8;
@@ -161,7 +178,7 @@
     typedef int                   int32;
     typedef unsigned long long    uint64;
     typedef long long             int64;
-
+#  endif
 /*@{*/
     typedef int16       F2Dot14;            /**< fixed: 2.14 */
     typedef int32       F16Dot16;           /**< fixed: 16.16 */
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/libgnomeprint/ttsubset/ttcr.c my-gtk/libgnomeprint/libgnomeprint/ttsubset/ttcr.c
--- from-cvs/libgnomeprint/libgnomeprint/ttsubset/ttcr.c	Wed Oct 13 01:28:08 2004
+++ my-gtk/libgnomeprint/libgnomeprint/ttsubset/ttcr.c	Thu Nov 18 09:31:13 2004
@@ -43,9 +43,12 @@
  * @version 1.3
  *
  */
+#include <config.h>
 
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <stdlib.h>
 #ifdef sun
@@ -407,7 +410,7 @@
     int fd, r;
 
     if (!fname) return SF_BADFILE;
-    if ((fd = open(fname, O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1) return SF_BADFILE;
+    if ((fd = open(fname, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, 0644)) == -1) return SF_BADFILE;
 
     if ((r = StreamToMemory(_this, &ptr, &length)) != SF_OK) return r;
 
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/makefile.msc.tmp my-gtk/libgnomeprint/makefile.msc.tmp
--- from-cvs/libgnomeprint/makefile.msc.tmp	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/makefile.msc.tmp	Sat Nov 13 23:01:04 2004
@@ -0,0 +1,57 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..
+PRJ_TOP = ..
+PACKAGE = unknown
+PKG_VER = 1.3
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+top_srcdir = $(PRJ_TOP)
+top_builddir = $(PRJ_TOP)
+includedir = $(PRJ_TOP)
+LT_RELEASE = $(PKG_VER)
+SUBDIRS = libgnomeprint tests data po doc
+
+sub-all: 
+	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one:
+	cd $(THIS)
+	nmake -nologo -f makefile.msc
+	cd ..
+
+DISTCLEANFILE = \
+	intltool-extract intltool-merge intltool-update
+
+EXTRA_DIST = \
+	ChangeLog \
+	ChangeLog.old \
+	ChangeLog.old.2 \
+	OChangeLog.gpa.2002-12-17 \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
+	gtk-doc.make
+
+all : \
+	$(PRJ_TOP)\config.h \
+	sub-all \
+	$(PACKAGE)
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
Only in from-cvs/libgnomeprint: po
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/tests/files/makefile.msc.tmp my-gtk/libgnomeprint/tests/files/makefile.msc.tmp
--- from-cvs/libgnomeprint/tests/files/makefile.msc.tmp	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/tests/files/makefile.msc.tmp	Sat Nov 13 23:01:04 2004
@@ -0,0 +1,41 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..\..
+PRJ_TOP = ..\..\..
+PACKAGE = unknown
+PKG_VER = 1.3
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+top_srcdir = $(PRJ_TOP)
+top_builddir = $(PRJ_TOP)
+includedir = $(PRJ_TOP)
+LT_RELEASE = $(PKG_VER)
+EXTRA_DIST = \
+	bad.ps \
+	good.ps \
+	pdf_bad.pdf \
+	pdf_good.pdf \
+	quit.txt \
+	test.utf8
+
+all : \
+	$(PRJ_TOP)\config.h \
+	$(PACKAGE)
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/tests/makefile.msc.tmp my-gtk/libgnomeprint/tests/makefile.msc.tmp
--- from-cvs/libgnomeprint/tests/makefile.msc.tmp	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/tests/makefile.msc.tmp	Sat Nov 13 23:01:04 2004
@@ -0,0 +1,111 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..
+PRJ_TOP = ..\..
+PACKAGE = unknown
+PKG_VER = 1.3
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+top_srcdir = $(PRJ_TOP)
+top_builddir = $(PRJ_TOP)
+includedir = $(PRJ_TOP)
+LT_RELEASE = $(PKG_VER)
+SUBDIRS = files output tools
+
+sub-all: 
+	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one:
+	cd $(THIS)
+	nmake -nologo -f makefile.msc
+	cd ..
+
+generate_LDFLAGS = \
+	
+
+AM_CFLAG = \
+	$(WARN_CFLAGS)
+
+EXTRA_DIST = \
+	quit.txt run-test.pl quit.txt
+
+OBJECTS = \
+	generate.obj \
+
+OBJECTS = \
+	simple.obj \
+
+pango_LDFLAGS = \
+	
+
+INCLUDES = \
+	-I$(top_srcdir) -I$(top_srcdir)/libgnomeprint/gpa $(LIBGNOMEPRINT_CFLAGS)
+
+OBJECTS = \
+	gpa-test.obj \
+
+OBJECTS = \
+	fonts.obj \
+
+fonts_LDADD = \
+	$(print_libs)
+
+generate_LDADD = \
+	$(print_libs)
+
+gpa_test_LDADD = \
+	$(print_libs)
+
+simple_LDFLAGS = \
+	
+
+gpa_test_LDFLAGS = \
+	
+
+fonts_LDFLAGS = \
+	
+
+print_libs = \
+	$(top_builddir)/libgnomeprint/libgnomeprint-2-2.la $(LIBGNOMEPRINT_LIBS) -lpopt
+
+pango_LDADD = \
+	$(print_libs)
+
+OBJECTS = \
+	pango.obj \
+
+gpa_test_DEPENDENCIES = \
+	$(DEPS)
+
+simple_LDADD = \
+	$(print_libs)
+
+noinst_PROGRAMS = \
+	generate \
+	gpa-test \
+	fonts \
+	simple \
+	pango
+
+all : \
+	$(PRJ_TOP)\config.h \
+	sub-all \
+	$(PACKAGE)
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/tests/output/makefile.msc.tmp my-gtk/libgnomeprint/tests/output/makefile.msc.tmp
--- from-cvs/libgnomeprint/tests/output/makefile.msc.tmp	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/tests/output/makefile.msc.tmp	Sat Nov 13 23:01:04 2004
@@ -0,0 +1,42 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..\..
+PRJ_TOP = ..\..\..
+PACKAGE = unknown
+PKG_VER = 1.3
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+top_srcdir = $(PRJ_TOP)
+top_builddir = $(PRJ_TOP)
+includedir = $(PRJ_TOP)
+LT_RELEASE = $(PKG_VER)
+CLEANFILES = \
+	*.ps \
+	*.pdf \
+	*.meta \
+	*.clean \
+	*.error \
+	*.result \
+	*~
+
+all : \
+	$(PRJ_TOP)\config.h \
+	$(PACKAGE)
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --exclude-from=c:\util\tool\diff.ign -u --recursive --unidirectional-new-file from-cvs/libgnomeprint/tests/tools/makefile.msc.tmp my-gtk/libgnomeprint/tests/tools/makefile.msc.tmp
--- from-cvs/libgnomeprint/tests/tools/makefile.msc.tmp	Thu Jan 01 01:00:00 1970
+++ my-gtk/libgnomeprint/tests/tools/makefile.msc.tmp	Sat Nov 13 23:01:04 2004
@@ -0,0 +1,51 @@
+# autogenerated from automake.am with automake.py
+TOP = ..\..\..\..
+PRJ_TOP = ..\..\..
+PACKAGE = unknown
+PKG_VER = 1.3
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+top_srcdir = $(PRJ_TOP)
+top_builddir = $(PRJ_TOP)
+includedir = $(PRJ_TOP)
+LT_RELEASE = $(PKG_VER)
+pdfcheck_LDADD = \
+	$(TOOLS_LIBS) $(LIBGNOMEPRINT_LIBS)
+
+OBJECTS = \
+	pdfcheck.obj \
+
+OBJECTS = \
+	xmlfix.obj \
+
+INCLUDES = \
+	$(TOOLS_CFLAGS)
+
+noinst_PROGRAMS = \
+	pdfcheck xmlfix
+
+xmlfix_LDADD = \
+	$(TOOLS_LIBS) $(LIBGNOMEPRINT_LIBS)
+
+all : \
+	$(PRJ_TOP)\config.h \
+	$(PACKAGE)
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
