Revert "Visual C++: Update gtka11y projects completion"

This broke 'make dist' on linux.

This reverts commit ecf2a9471b4dd440709ffa4ae7c3efb5741dfaa5.

diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index ac7c43b1d71c50e744dadd2b3496f5bd5faddef8..e5548ab9826c66352d17fdad4aa2e817aa4ae3f1 100644 (file)
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -16,10 +16,10 @@ EXTRA_DIST += \
        gtk.vcxproj.filtersin \
        gtk3-demo.vcxproj \
        gtk3-demo.vcxproj.filters \
-       gtka11y.vcxproj \
-       gtka11y.vcxproj.filters \
-       gtka11y.vcxprojin \
-       gtka11y.vcxproj.filtersin \
+       libgail.vcxproj \
+       libgail.vcxproj.filters \
+       libgail.vcxprojin \
+       libgail.vcxproj.filtersin \
        gailutil.vcxproj \
        gailutil.vcxproj.filters \
        install.vcxproj

diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln
index 25fe37c347b97a09571e9e8fa912fb65dc134741..4350f89a93059e5ae1d4a982b41e9125bdc2e7c4 100644 (file)
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5A
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"\r
 EndProject\r

diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index 09d1b3b684a1ed1a539f6150b60bfa37c1f57a95..a47e12e14a981f1a79c515b6031ad4ddf59fec9e 100644 (file)
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -204,7 +204,7 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtka11y.vcxproj">
+    <ProjectReference Include="libgail.vcxproj">
       <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>

diff --git a/build/win32/vs10/gtka11y.filtersin b/build/win32/vs10/libgail.vcxproj.filtersin
similarity index 92%
rename from build/win32/vs10/gtka11y.filtersin
rename to build/win32/vs10/libgail.vcxproj.filtersin
index 047f977eb01df19911c55dff2a39b18820fe679e..636f826a21267738ddaccf530c348aa56e7e4e3f 100644 (file)
--- a/build/win32/vs10/gtka11y.filtersin
+++ b/build/win32/vs10/libgail.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
-#include "gtka11y.vs10.sourcefiles.filters"\r
+#include "libgail.vs10.sourcefiles.filters"\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/build/win32/vs10/gtka11y.vcxprojin b/build/win32/vs10/libgail.vcxprojin
similarity index 97%
rename from build/win32/vs10/gtka11y.vcxprojin
rename to build/win32/vs10/libgail.vcxprojin
index 9ee855a251341f3c5d7ec2e676dd790a7af401d4..1f1ad36e67725424f5dadbf6de198aebbab5e75a 100644 (file)
--- a/build/win32/vs10/gtka11y.vcxprojin
+++ b/build/win32/vs10/libgail.vcxprojin
@@ -20,7 +20,7 @@
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>\r
-    <RootNamespace>gtka11y</RootNamespace>\r
+    <RootNamespace>libgail</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
@@ -120,7 +120,7 @@
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-#include "gtka11y.vs10.sourcefiles"\r
+#include "libgail.vs10.sourcefiles"\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 10bdd326aa53c645d93721329f8fbbae78fbc60e..c0c1500bc7e43c4d0c943a759ed5f836076cd9fb 100644 (file)
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -10,8 +10,8 @@ EXTRA_DIST += \
        gtk.vcproj \
        gtk.vcprojin \
        gtk3-demo.vcproj \
-       gtka11y.vcproj \
-       gtka11y.vcprojin \
+       libgail.vcproj \
+       libgail.vcprojin \
        gailutil.vcproj \
        install.vcproj
 

diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln
index 13c22f9d87d8f8ff4fc97d7fc48e610a5f0ec258..2620e17888675a4d8f849d4e9e922e17c68eb805 100644 (file)
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcpr
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"\r
        ProjectSection(ProjectDependencies) = postProject\r

diff --git a/build/win32/vs9/gtka11y.vcprojin b/build/win32/vs9/libgail.vcprojin
similarity index 93%
rename from build/win32/vs9/gtka11y.vcprojin
rename to build/win32/vs9/libgail.vcprojin
index 1943de1f532806be822052c29433ea0c19896a4e..a9dbea6ef2e4ad51e6ed66848929badb8f0d2794 100644 (file)
--- a/build/win32/vs9/gtka11y.vcprojin
+++ b/build/win32/vs9/libgail.vcprojin
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="9.00"\r
-       Name="gtka11y"\r
+       Name="libgail"\r
        ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"\r
-       RootNamespace="gtka11y"\r
+       RootNamespace="libgail"\r
        Keyword="Win32Proj"\r
        TargetFrameworkVersion="196613"\r
        >\r
@@ -115,7 +115,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
-#include "gtka11y.sourcefiles"\r
+#include "libgail.sourcefiles"\r
                </Filter>\r
                <Filter\r
                        Name="Headers"\r

diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index a451e8c1ea434e414fa32b6b1f0828657d01a1da..5eec7d42fd1c5b8a34da81d8a4c0299910130665 100644 (file)
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -137,37 +137,37 @@ libgtka11y_la_LIBADD =            \
 libgtka11y_la_LDFLAGS =                \
         $(LDFLAGS)
 
-dist-hook: ../../build/win32/vs9/gtka11y.vcproj ../../build/win32/vs10/gtka11y.vcxproj ../../build/win32/vs10/gtka11y.vcxproj.filters
+dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters
 
-../../build/win32/vs9/gtka11y.vcproj: ../../build/win32/vs9/gtka11y.vcprojin
-       for F in $(libgtka11y_la_SOURCES); do \
+../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin
+       for F in $(libgail_la_SOURCES); do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\gtk\a11y\'$$F'" />' \
                     ;; \
                esac; \
-       done >gtka11y.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtka11y.vcprojin >$@
-       rm gtka11y.sourcefiles
+       done >libgail.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@
+       rm libgail.sourcefiles
 
-../../build/win32/vs10/gtka11y.vcxproj: ../../build/win32/vs10/gtka11y.vcxprojin
-       for F in $(libgtka11y_la_SOURCES); do \
+../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin
+       for F in $(libgail_la_SOURCES); do \
                case $$F in \
                *.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'" />' \
                     ;; \
                esac; \
-       done >gtka11y.vs10.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxprojin >$@
-       rm gtka11y.vs10.sourcefiles
+       done >libgail.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxprojin >$@
+       rm libgail.vs10.sourcefiles
 
-../../build/win32/vs10/gtka11y.vcxproj.filters: ../../build/win32/vs10/gtka11y.vcxproj.filtersin
-       for F in $(libgtka11y_la_SOURCES); do \
+../../build/win32/vs10/libgail.vcxproj.filters: ../../build/win32/vs10/libgail.vcxproj.filtersin
+       for F in $(libgail_la_SOURCES); do \
                case $$F in \
                *.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
                     ;; \
                esac; \
-       done >gtka11y.vs10.sourcefiles.filters
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxproj.filtersin >$@
-       rm gtka11y.vs10.sourcefiles.filters
+       done >libgail.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxproj.filtersin >$@
+       rm libgail.vs10.sourcefiles.filters
 
 
 -include $(top_srcdir)/git.mk