[clutter/msvc-support] Prepare the merge of master into msvc-branch

[Chun-wei Fan <fanchunwei src gnome org>]

commit 73eb52a093ca1b610f2474136458e3a59da41cdc
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 13 12:18:46 2011 +0800

    Prepare the merge of master into msvc-branch
    
    The Makefile.am's under Cogl are to be removed.  So make them like the
    ones in Clutter now

 clutter/cogl/Makefile.am       |    6 ++--
 clutter/cogl/cogl/Makefile.am  |   45 ----------------------------------------
 clutter/cogl/pango/Makefile.am |   40 -----------------------------------
 3 files changed, 3 insertions(+), 88 deletions(-)
---
diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am
index 0b67b69..e695860 100644
--- a/clutter/cogl/Makefile.am
+++ b/clutter/cogl/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = cogl pango
 
-#if COGL_STANDALONE_BUILD
-#SUBDIRS += po
-#endif
+if COGL_STANDALONE_BUILD
+SUBDIRS += po
+endif
 
 ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index c9a739d..a9d1d07 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -114,7 +114,6 @@ cogl_driver_sources =
 
 if COGL_DRIVER_GL
 cogl_driver_sources += \
-	$(srcdir)/driver/gl/cogl-context-driver-gl.h	\
 	$(srcdir)/driver/gl/cogl-feature-functions-gl.h	\
 	$(srcdir)/driver/gl/cogl-gl.c			\
 	$(srcdir)/driver/gl/cogl-texture-driver-gl.c	\
@@ -393,50 +392,6 @@ endif
 libcogl_la_SOURCES = $(cogl_sources_c)
 nodist_libcogl_la_SOURCES = $(BUILT_SOURCES)
 
-dist-hook: ../../../build/win32/vs9/cogl.vcproj ../../../build/win32/vs10/cogl.vcxproj ../../../build/win32/vs10/cogl.vcxproj.filters
-
-# I know those filters below don't look nice, but this is to ensure the right files are in the Project files only *once*
-../../../build/win32/vs9/cogl.vcproj: $(top_srcdir)/build/win32/vs9/cogl.vcprojin
-	for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \
-		case $$F in \
-		*-osx.c|*-egl.c|*-fruity.c|*-glx.c|*-xlib.c|*-x11.c|*-win32.c|*-gl.c|*-gles.c|*-stub.c|*.h) ;; \
-		*.c)	echo '   <File RelativePath="..\..\..\clutter\cogl\cogl\'$$F'" />' \
-			;; \
-		esac; \
-	done >cogl.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/cogl.vcprojin >$@
-	rm cogl.sourcefiles
-	
-../../../build/win32/vs10/cogl.vcxproj: $(top_srcdir)/build/win32/vs10/cogl.vcxprojin
-	for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \
-		case $$F in \
-		*-osx.c|*-egl.c|*-fruity.c|*-glx.c|*-xlib.c|*-x11.c|*-win32.c|*-gl.c|*-gles.c|*-stub.c|*.h) ;; \
-		*.c)	echo '    <ClCompile Include="..\..\..\clutter\cogl\cogl\'$$F'" />' \
-			;; \
-		esac; \
-	done >cogl.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxprojin >$@
-	rm cogl.vs10.sourcefiles
-	
-../../../build/win32/vs10/cogl.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin
-	for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \
-		case $$F in \
-		*-osx.c|*-egl.c|*-fruity.c|*-glx.c|*-xlib.c|*-x11.c|*-win32.c|*-gl.c|*-gles.c|*-stub.c|*.h) ;; \
-		*.c)	echo '    <ClCompile Include="..\..\..\clutter\cogl\cogl\'$$F'"><Filter>Sources</Filter></ClCompile>' \
-			;; \
-		esac; \
-	done >cogl.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin >$@
-	rm cogl.vs10.sourcefiles.filters
-
-EXTRA_DIST +=	\
-	$(srcdir)/cogl-defines.h.win32		\
-	cogl.symbols	\
-	$(NULL)
-
-# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES += ../../../build/win32/vs9/cogl.vcproj ../../../build/win32/vs10/cogl.vcxproj ../../../build/win32/vs10/cogl.vcxproj.filters
-
 # Cogl installed headers
 cogl_headers = \
 	$(cogl_public_h) \
diff --git a/clutter/cogl/pango/Makefile.am b/clutter/cogl/pango/Makefile.am
index 13a0685..9d44c02 100644
--- a/clutter/cogl/pango/Makefile.am
+++ b/clutter/cogl/pango/Makefile.am
@@ -51,43 +51,3 @@ else
 coglpangoheadersdir = $(includedir)/clutter- CLUTTER_API_VERSION@/cogl
 coglpangoheaders_HEADERS = $(source_h)
 endif
-
-dist-hook: ../../../build/win32/vs9/cogl-pango.vcproj ../../../build/win32/vs10/cogl-pango.vcxproj ../../../build/win32/vs10/cogl-pango.vcxproj.filters
-
-../../../build/win32/vs9/cogl-pango.vcproj: $(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin
-	for F in $(source_c); do \
-		case $$F in \
-		*.c)	echo '   <File RelativePath="..\..\..\clutter\cogl\pango\'$$F'" />' \
-			;; \
-		esac; \
-	done >coglpango.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin >$@
-	rm coglpango.sourcefiles
-	
-../../../build/win32/vs10/cogl-pango.vcxproj: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin
-	for F in $(source_c); do \
-		case $$F in \
-		*.c)	echo '    <ClCompile Include="..\..\..\clutter\cogl\pango\'$$F'" />' \
-			;; \
-		esac; \
-	done >coglpango.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin >$@
-	rm coglpango.vs10.sourcefiles
-	
-../../../build/win32/vs10/cogl-pango.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin
-	for F in $(source_c); do \
-		case $$F in \
-		*.c)	echo '    <ClCompile Include="..\..\..\clutter\cogl\pango\'$$F'"><Filter>Sources</Filter></ClCompile>' \
-			;; \
-		esac; \
-	done >coglpango.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin >$@
-	rm coglpango.vs10.sourcefiles.filters
-
-EXTRA_DIST = cogl-pango.symbols
-
-# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES = ../../../build/win32/vs9/cogl-pango.vcproj	\
-		  ../../../build/win32/vs10/cogl-pango.vcxproj	\
-		  ../../../build/win32/vs10/cogl-pango.vcxproj.filters
-