From 4fe1effb36836ce16068e4c0e1ef5a65b810fa88 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 8 Feb 2013 18:29:22 +0100 Subject: [PATCH] Revert "Visual C++: Update gtka11y projects completion" This broke 'make dist' on linux. This reverts commit ecf2a9471b4dd440709ffa4ae7c3efb5741dfaa5. --- build/win32/vs10/Makefile.am | 8 ++--- build/win32/vs10/gtk+.sln | 2 +- build/win32/vs10/gtk.vcxprojin | 2 +- ...1y.filtersin => libgail.vcxproj.filtersin} | 2 +- .../{gtka11y.vcxprojin => libgail.vcxprojin} | 4 +-- build/win32/vs9/Makefile.am | 4 +-- build/win32/vs9/gtk+.sln | 2 +- .../{gtka11y.vcprojin => libgail.vcprojin} | 6 ++-- gtk/a11y/Makefile.am | 32 +++++++++---------- 9 files changed, 31 insertions(+), 31 deletions(-) rename build/win32/vs10/{gtka11y.filtersin => libgail.vcxproj.filtersin} (91%) rename build/win32/vs10/{gtka11y.vcxprojin => libgail.vcxprojin} (96%) rename build/win32/vs9/{gtka11y.vcprojin => libgail.vcprojin} (93%) diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index ac7c43b1d7..e5548ab982 100644 --- 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 25fe37c347..4350f89a93 100644 --- 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 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" EndProject diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin index 09d1b3b684..a47e12e14a 100644 --- a/build/win32/vs10/gtk.vcxprojin +++ b/build/win32/vs10/gtk.vcxprojin @@ -204,7 +204,7 @@ {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} false - + {f756b0db-40a1-4e9f-be1f-8f02cb86ea46} false diff --git a/build/win32/vs10/gtka11y.filtersin b/build/win32/vs10/libgail.vcxproj.filtersin similarity index 91% rename from build/win32/vs10/gtka11y.filtersin rename to build/win32/vs10/libgail.vcxproj.filtersin index 047f977eb0..636f826a21 100644 --- a/build/win32/vs10/gtka11y.filtersin +++ b/build/win32/vs10/libgail.vcxproj.filtersin @@ -15,6 +15,6 @@ -#include "gtka11y.vs10.sourcefiles.filters" +#include "libgail.vs10.sourcefiles.filters" \ No newline at end of file diff --git a/build/win32/vs10/gtka11y.vcxprojin b/build/win32/vs10/libgail.vcxprojin similarity index 96% rename from build/win32/vs10/gtka11y.vcxprojin rename to build/win32/vs10/libgail.vcxprojin index 9ee855a251..1f1ad36e67 100644 --- a/build/win32/vs10/gtka11y.vcxprojin +++ b/build/win32/vs10/libgail.vcxprojin @@ -20,7 +20,7 @@ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} - gtka11y + libgail Win32Proj @@ -120,7 +120,7 @@ -#include "gtka11y.vs10.sourcefiles" +#include "libgail.vs10.sourcefiles" diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 10bdd326aa..c0c1500bc7 100644 --- 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 13c22f9d87..2620e17888 100644 --- 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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" ProjectSection(ProjectDependencies) = postProject 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 1943de1f53..a9dbea6ef2 100644 --- a/build/win32/vs9/gtka11y.vcprojin +++ b/build/win32/vs9/libgail.vcprojin @@ -2,9 +2,9 @@ @@ -115,7 +115,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "gtka11y.sourcefiles" +#include "libgail.sourcefiles" ' \ ;; \ 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 ' ' \ ;; \ 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 ' Source Files' \ ;; \ 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