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	Mon Nov 22 23:34:03 2004
@@ -0,0 +1,17 @@
+/* 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)
+
+#define popen(f,m) _popen(f,m)
+#define pclose(f) _pclose(f)
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 Dec 03 21:03:08 2004
@@ -0,0 +1,426 @@
+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_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/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 Dec 03 21:24:52 2004
@@ -0,0 +1,236 @@
+# 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 -DENABLE_SVG
+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
+
+SUBDEPS = gpa ttsubset 
+SUBMODS = transports modules
+
+sub-all-deps: 
+	for %d in ($(SUBDEPS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-all-mods: 
+	for %d in ($(SUBMODS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one:
+	cd $(THIS)
+	nmake -nologo -f makefile.msc SUB_$(THIS)=1
+	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-deps \
+	libgnomeprint-marshal.h \
+	libgnomeprint-marshal.c \
+	$(PACKAGE)-$(PKG_VER).dll \
+	sub-all-mods \
+
+
+$(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 Dec 03 21:26:07 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 = lpd #papi cups win32 
+
+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/transports/gp-transport-file.c my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-file.c
--- from-cvs/libgnomeprint/libgnomeprint/transports/gp-transport-file.c	Fri Dec 03 20:50:33 2004
+++ my-gtk/libgnomeprint/libgnomeprint/transports/gp-transport-file.c	Fri Dec 03 21:56:36 2004
@@ -156,7 +156,7 @@
 	g_return_val_if_fail (tf->name != NULL, GNOME_PRINT_ERROR_UNKNOWN);
 
 #if defined(G_OS_WIN32) && (defined(__MINGW32__) || defined _MSC_VER)
-	tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY);
+	tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, _S_IREAD | _S_IWRITE);
 #else
 	tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 #endif
@@ -200,7 +200,7 @@
 
 	l = len;
 	while (l > 0) {
-		size_t written;
+		gint written;
 		written = write (tf->fd, buf, len);
 		if (written < 0) {
 			g_warning ("Writing output file failed");
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	Fri Dec 03 21:26:34 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/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) $<
