From ecf2a9471b4dd440709ffa4ae7c3efb5741dfaa5 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 23 Jan 2013 13:56:11 +0800 Subject: [PATCH] Visual C++: Update gtka11y projects completion -Rename the "libgail" projects to gtka11y, for consistency with the autotools builds -Update the projects completion in gtk/a11y/Makefile.am, as the sources are now listed under $(libgtka11y_la_SOURCES) instead of $(libgail_la_SOURCES) --- build/win32/vs10/Makefile.am | 8 ++--- build/win32/vs10/gtk+.sln | 2 +- build/win32/vs10/gtk.vcxprojin | 2 +- ...il.vcxproj.filtersin => gtka11y.filtersin} | 2 +- .../{libgail.vcxprojin => gtka11y.vcxprojin} | 4 +-- build/win32/vs9/Makefile.am | 4 +-- build/win32/vs9/gtk+.sln | 2 +- .../{libgail.vcprojin => gtka11y.vcprojin} | 6 ++-- gtk/a11y/Makefile.am | 32 +++++++++---------- 9 files changed, 31 insertions(+), 31 deletions(-) rename build/win32/vs10/{libgail.vcxproj.filtersin => gtka11y.filtersin} (92%) rename build/win32/vs10/{libgail.vcxprojin => gtka11y.vcxprojin} (97%) rename build/win32/vs9/{libgail.vcprojin => gtka11y.vcprojin} (93%) diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 58e6440aef..0465eb2601 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 \ - libgail.vcxproj \ - libgail.vcxproj.filters \ - libgail.vcxprojin \ - libgail.vcxproj.filtersin \ + gtka11y.vcxproj \ + gtka11y.vcxproj.filters \ + gtka11y.vcxprojin \ + gtka11y.vcxproj.filtersin \ gailutil.vcxproj \ gailutil.vcxproj.filters \ install.vcxproj diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln index 762167f9c7..c3b5576bc2 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}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.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 ae8b349683..a949e386bb 100644 --- a/build/win32/vs10/gtk.vcxprojin +++ b/build/win32/vs10/gtk.vcxprojin @@ -200,7 +200,7 @@ {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} false - + {f756b0db-40a1-4e9f-be1f-8f02cb86ea46} false diff --git a/build/win32/vs10/libgail.vcxproj.filtersin b/build/win32/vs10/gtka11y.filtersin similarity index 92% rename from build/win32/vs10/libgail.vcxproj.filtersin rename to build/win32/vs10/gtka11y.filtersin index 636f826a21..047f977eb0 100644 --- a/build/win32/vs10/libgail.vcxproj.filtersin +++ b/build/win32/vs10/gtka11y.filtersin @@ -15,6 +15,6 @@ -#include "libgail.vs10.sourcefiles.filters" +#include "gtka11y.vs10.sourcefiles.filters" \ No newline at end of file diff --git a/build/win32/vs10/libgail.vcxprojin b/build/win32/vs10/gtka11y.vcxprojin similarity index 97% rename from build/win32/vs10/libgail.vcxprojin rename to build/win32/vs10/gtka11y.vcxprojin index a5fba2a495..8809a52a56 100644 --- a/build/win32/vs10/libgail.vcxprojin +++ b/build/win32/vs10/gtka11y.vcxprojin @@ -20,7 +20,7 @@ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} - libgail + gtka11y Win32Proj @@ -119,7 +119,7 @@ -#include "libgail.vs10.sourcefiles" +#include "gtka11y.vs10.sourcefiles" diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 63dca52aaa..15ee37ceba 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST += \ gtk.vcproj \ gtk.vcprojin \ gtk3-demo.vcproj \ - libgail.vcproj \ - libgail.vcprojin \ + gtka11y.vcproj \ + gtka11y.vcprojin \ gailutil.vcproj \ install.vcproj diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln index 2620e17888..13c22f9d87 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}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.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/libgail.vcprojin b/build/win32/vs9/gtka11y.vcprojin similarity index 93% rename from build/win32/vs9/libgail.vcprojin rename to build/win32/vs9/gtka11y.vcprojin index a9dbea6ef2..1943de1f53 100644 --- a/build/win32/vs9/libgail.vcprojin +++ b/build/win32/vs9/gtka11y.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 "libgail.sourcefiles" +#include "gtka11y.sourcefiles" ' \ ;; \ esac; \ - done >libgail.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@ - rm libgail.sourcefiles + done >gtka11y.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtka11y.vcprojin >$@ + rm gtka11y.sourcefiles -../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin - for F in $(libgail_la_SOURCES); do \ +../../build/win32/vs10/gtka11y.vcxproj: ../../build/win32/vs10/gtka11y.vcxprojin + for F in $(libgtka11y_la_SOURCES); do \ case $$F in \ *.c) echo ' ' \ ;; \ esac; \ - done >libgail.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxprojin >$@ - rm libgail.vs10.sourcefiles + done >gtka11y.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxprojin >$@ + rm gtka11y.vs10.sourcefiles -../../build/win32/vs10/libgail.vcxproj.filters: ../../build/win32/vs10/libgail.vcxproj.filtersin - for F in $(libgail_la_SOURCES); do \ +../../build/win32/vs10/gtka11y.vcxproj.filters: ../../build/win32/vs10/gtka11y.vcxproj.filtersin + for F in $(libgtka11y_la_SOURCES); do \ case $$F in \ *.c) echo ' Source Files' \ ;; \ esac; \ - done >libgail.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxproj.filtersin >$@ - rm libgail.vs10.sourcefiles.filters + done >gtka11y.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxproj.filtersin >$@ + rm gtka11y.vs10.sourcefiles.filters -include $(top_srcdir)/git.mk