Revert "Remove the .vcproj files before rewriting them"

Revert .vcproj files and accompanying commits as the build stuff
needs more work.

8 files changed, 54 insertions, 205 deletions

diff --git a/pango/Makefile.am b/pango/Makefile.am
index 37510fa0..cef644f1 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -14,6 +14,8 @@ if HAVE_FREETYPE
 OPENTYPE_SUBDIR=opentype
 endif
 
+EXTRA_DIST = 
+
 FRIBIDI_SUBDIR=mini-fribidi
 
 SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
@@ -348,23 +350,18 @@ libpangocairo_1_0_la_LIBADD =			\
 	$(libm)
 libpangocairo_1_0_la_DEPENDENCIES =		\
 	libpango-$(PANGO_API_VERSION).la
-pangocairo_core_sources = \
+libpangocairo_1_0_la_SOURCES =  \
 	pangocairo-context.c    \
 	pangocairo-font.c	\
 	pangocairo-fontmap.c    \
 	pangocairo-render.c	\
 	pangocairo-private.h
 
-libpangocairo_1_0_la_SOURCES = $(pangocairo_core_sources)
-
 if HAVE_CAIRO_WIN32
 if PLATFORM_WIN32
-libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def -Wl,pangocairo-win32-res.o
-libpangocairo_1_0_la_DEPENDENCIES += pangocairo-win32-res.o pangocairo.def
+libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
+libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
 endif
-pangocairo-win32-res.o: pangocairo.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
 
 libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
 libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la 
@@ -559,11 +556,9 @@ pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
 endif
 pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 
-EXTRA_DIST =					\
+EXTRA_DIST +=					\
 	pango-enum-types.h			\
 	module-defs.h				\
-	module-defs.h.win32			\
-	module-defs-lang.c.win32		\
 	module-defs-fc.c.win32			\
 	module-defs-win32.c.win32		\
 	pango.def				\
@@ -578,8 +573,6 @@ EXTRA_DIST =					\
 	pangoft2.rc.in				\
 	pangowin32.rc				\
 	pangowin32.rc.in			\
-	pangocairo.rc				\
-	pangocairo.rc.in			\
 	pangox.rc				\
 	pangox.rc.in				\
 	pangoxft.rc				\
@@ -637,43 +630,4 @@ uninstall-local: uninstall-ms-lib uninstall-def-files
 
 TESTS = check.defs
 
-dist-hook: \
-	../build/win32/vs9/pango.vcproj \
-	../build/win32/vs9/pangoft2.vcproj \
-	../build/win32/vs9/pangocairo.vcproj
-
-# pangowin32.vcproj is not automatically built, it is not being changed
-
-../build/win32/vs9/pango.vcproj: $(top_srcdir)/build/win32/vs9/pango.vcprojin mini-fribidi/libmini-fribidi.sourcefiles
-	-rm $@
-	for F in $(libpango_1_0_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpango.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vcprojin >$@
-
-../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin opentype/libharfbuzz.sourcefiles
-	-rm $@
-	for F in $(libpangoft2_1_0_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpangoft2.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangoft2.vcprojin >$@
-
-../build/win32/vs9/pangocairo.vcproj: $(top_srcdir)/build/win32/vs9/pangocairo.vcprojin
-# Backend-specific sources for the libpangocairo DLL are explicitly
-# listed in the vcprojin file
-	-rm $@
-	for F in $(pangocairo_core_sources); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpangocairo.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangocairo.vcprojin >$@
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index a0baa6b0..a9e08d6e 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -30,14 +30,4 @@ EXTRA_DIST = 			\
         fribidi_types.i
 
 
-dist-hook: libmini-fribidi.sourcefiles
-
-libmini-fribidi.sourcefiles: Makefile
-	for F in $(libmini_fribidi_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '			<File RelativePath="..\..\..\pango\mini-fribidi\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libmini-fribidi.sourcefiles
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/module-defs-fc.c.win32 b/pango/module-defs-fc.c.win32
index 7a44537c..a6ae1cff 100644
--- a/pango/module-defs-fc.c.win32
+++ b/pango/module-defs-fc.c.win32
@@ -1,17 +1,31 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
+/* Hand-written. Once the GNU configure mechanism is used
+ * on Win32, too, can be generated.
+*/
 
-#include "module-defs.h"
+#include "modules.h"
+
+#ifdef PANGO_MODULE_PREFIX
+/* by defining PANGO_MODULE_PREFIX the basic module gets include in the
+ * backend library, here ../modules/basic/basic-fc.c
+ * It helps the backend to not fall on its nose even with a screwed module
+ * configuration. There should be at least enough fonts available to show
+ * an error message ...
+ */
+void         _pango_basic_ft2_script_engine_list   (PangoEngineInfo **engines,
+                                                    gint             *n_engines);
+void         _pango_basic_ft2_script_engine_init   (GTypeModule      *module);
+void         _pango_basic_ft2_script_engine_exit   (void);
+PangoEngine *_pango_basic_ft2_script_engine_create (const char       *id);
+#endif
 
 PangoIncludedModule _pango_included_fc_modules[] = {
- { _pango_arabic_fc_script_engine_list, _pango_arabic_fc_script_engine_init, _pango_arabic_fc_script_engine_exit, _pango_arabic_fc_script_engine_create },
- { _pango_basic_fc_script_engine_list, _pango_basic_fc_script_engine_init, _pango_basic_fc_script_engine_exit, _pango_basic_fc_script_engine_create },
- { _pango_hangul_fc_script_engine_list, _pango_hangul_fc_script_engine_init, _pango_hangul_fc_script_engine_exit, _pango_hangul_fc_script_engine_create },
- { _pango_hebrew_fc_script_engine_list, _pango_hebrew_fc_script_engine_init, _pango_hebrew_fc_script_engine_exit, _pango_hebrew_fc_script_engine_create },
- { _pango_indic_fc_script_engine_list, _pango_indic_fc_script_engine_init, _pango_indic_fc_script_engine_exit, _pango_indic_fc_script_engine_create },
- { _pango_khmer_fc_script_engine_list, _pango_khmer_fc_script_engine_init, _pango_khmer_fc_script_engine_exit, _pango_khmer_fc_script_engine_create },
- { _pango_syriac_fc_script_engine_list, _pango_syriac_fc_script_engine_init, _pango_syriac_fc_script_engine_exit, _pango_syriac_fc_script_engine_create },
- { _pango_thai_fc_script_engine_list, _pango_thai_fc_script_engine_init, _pango_thai_fc_script_engine_exit, _pango_thai_fc_script_engine_create },
- { _pango_tibetan_fc_script_engine_list, _pango_tibetan_fc_script_engine_init, _pango_tibetan_fc_script_engine_exit, _pango_tibetan_fc_script_engine_create },
- { NULL, NULL, NULL, NULL },
+#ifdef PANGO_MODULE_PREFIX
+ { 
+   _pango_basic_ft2_script_engine_list,  
+   _pango_basic_ft2_script_engine_init, 
+   _pango_basic_ft2_script_engine_exit,  
+   _pango_basic_ft2_script_engine_create 
+ },
+#endif
+ { NULL, NULL, NULL },
 };
diff --git a/pango/module-defs-lang.c.win32 b/pango/module-defs-lang.c.win32
deleted file mode 100644
index d1fe979d..00000000
--- a/pango/module-defs-lang.c.win32
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Autogenerated and saved for builds using Microsoft's compiler,
- * when the configure mechanism isn't used.
- */
-
-#include "module-defs.h"
-
-PangoIncludedModule _pango_included_lang_modules[] = {
- { _pango_arabic_lang_script_engine_list, _pango_arabic_lang_script_engine_init, _pango_arabic_lang_script_engine_exit, _pango_arabic_lang_script_engine_create },
- { _pango_indic_lang_script_engine_list, _pango_indic_lang_script_engine_init, _pango_indic_lang_script_engine_exit, _pango_indic_lang_script_engine_create },
- { NULL, NULL, NULL, NULL },
-};
diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32
index 5c1698c6..80fc90a3 100644
--- a/pango/module-defs-win32.c.win32
+++ b/pango/module-defs-win32.c.win32
@@ -1,9 +1,25 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
+/* Hand-written, for builds using Microsoft's compiler and makefile.msc,
+ * where the configure mechanism isn't used.
+ */
 
-#include "module-defs.h"
+#include "modules.h"
+
+#ifdef PANGO_MODULE_PREFIX
+void         _pango_basic_win32_script_engine_list   (PangoEngineInfo **engines,
+                                                      gint             *n_engines);
+void         _pango_basic_win32_script_engine_init   (GTypeModule      *module);
+void         _pango_basic_win32_script_engine_exit   (void);
+PangoEngine *_pango_basic_win32_script_engine_create (const char       *id);
+#endif
 
 PangoIncludedModule _pango_included_win32_modules[] = {
- { _pango_basic_win32_script_engine_list, _pango_basic_win32_script_engine_init, _pango_basic_win32_script_engine_exit, _pango_basic_win32_script_engine_create },
- { NULL, NULL, NULL, NULL },
+#ifdef PANGO_MODULE_PREFIX
+ { 
+   _pango_basic_win32_script_engine_list,  
+   _pango_basic_win32_script_engine_init, 
+   _pango_basic_win32_script_engine_exit,  
+   _pango_basic_win32_script_engine_create 
+ },
+#endif
+ { NULL, NULL, NULL },
 };
diff --git a/pango/module-defs.h.win32 b/pango/module-defs.h.win32
deleted file mode 100644
index 463935ef..00000000
--- a/pango/module-defs.h.win32
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
-
-#include "modules.h"
-
-extern void         _pango_arabic_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_arabic_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_arabic_fc_script_engine_exit (void);
-extern PangoEngine *_pango_arabic_fc_script_engine_create (const char *id);
-
-extern void         _pango_arabic_lang_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_arabic_lang_script_engine_init (GTypeModule *module);
-extern void         _pango_arabic_lang_script_engine_exit (void);
-extern PangoEngine *_pango_arabic_lang_script_engine_create (const char *id);
-
-extern void         _pango_basic_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_fc_script_engine_exit (void);
-extern PangoEngine *_pango_basic_fc_script_engine_create (const char *id);
-
-extern void         _pango_basic_win32_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_win32_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_win32_script_engine_exit (void);
-extern PangoEngine *_pango_basic_win32_script_engine_create (const char *id);
-
-extern void         _pango_basic_x_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_x_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_x_script_engine_exit (void);
-extern PangoEngine *_pango_basic_x_script_engine_create (const char *id);
-
-extern void         _pango_basic_atsui_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_atsui_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_atsui_script_engine_exit (void);
-extern PangoEngine *_pango_basic_atsui_script_engine_create (const char *id);
-
-extern void         _pango_hangul_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_hangul_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_hangul_fc_script_engine_exit (void);
-extern PangoEngine *_pango_hangul_fc_script_engine_create (const char *id);
-
-extern void         _pango_hebrew_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_hebrew_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_hebrew_fc_script_engine_exit (void);
-extern PangoEngine *_pango_hebrew_fc_script_engine_create (const char *id);
-
-extern void         _pango_indic_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_indic_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_indic_fc_script_engine_exit (void);
-extern PangoEngine *_pango_indic_fc_script_engine_create (const char *id);
-
-extern void         _pango_indic_lang_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_indic_lang_script_engine_init (GTypeModule *module);
-extern void         _pango_indic_lang_script_engine_exit (void);
-extern PangoEngine *_pango_indic_lang_script_engine_create (const char *id);
-
-extern void         _pango_khmer_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_khmer_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_khmer_fc_script_engine_exit (void);
-extern PangoEngine *_pango_khmer_fc_script_engine_create (const char *id);
-
-extern void         _pango_syriac_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_syriac_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_syriac_fc_script_engine_exit (void);
-extern PangoEngine *_pango_syriac_fc_script_engine_create (const char *id);
-
-extern void         _pango_thai_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_thai_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_thai_fc_script_engine_exit (void);
-extern PangoEngine *_pango_thai_fc_script_engine_create (const char *id);
-
-extern void         _pango_tibetan_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_tibetan_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_tibetan_fc_script_engine_exit (void);
-extern PangoEngine *_pango_tibetan_fc_script_engine_create (const char *id);
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index 23bb55b3..ebec8ce6 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -55,14 +55,4 @@ main_LDADD = libharfbuzz.la $(GLIB_LIBS)
 
 EXTRA_DIST = README COPYING
 
-dist-hook: libharfbuzz.sourcefiles
-
-libharfbuzz.sourcefiles: Makefile
-	for F in $(libharfbuzz_la_SOURCES); do \
-		case $$F in \
-		*.c|*.cc) echo '   <File RelativePath="..\..\..\pango\opentype\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libharfbuzz.sourcefiles
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/pangocairo.rc.in b/pango/pangocairo.rc.in
deleted file mode 100644
index 728cce70..00000000
--- a/pango/pangocairo.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
-  PRODUCTVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-	VALUE "CompanyName", "Red Hat Software"
-	VALUE "FileDescription", "PangoCairo"
-	VALUE "FileVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@.0"
-	VALUE "InternalName", "pangocairo-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
-	VALUE "LegalCopyright", "Copyright © 2010 Red Hat Software."
-	VALUE "OriginalFilename", "pangocairo-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
-	VALUE "ProductName", "PangoCairo"
-	VALUE "ProductVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END