GNOME.org
 

[gtk/msvcproj-nmake-install: 11/22] build: Drop gtk3-install.[vsprops|props]


commit f4811ea1f1106b34b9980c2566ccd10374dea798
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon May 16 17:59:02 2022 +0800

    build: Drop gtk3-install.[vsprops|props]
    
    They are not used anymore, and are removed at this point.

 gdk/Makefile.am                  |   8 --
 gdk/broadway/Makefile.am         |   8 +-
 gdk/win32/Makefile.am            |   8 +-
 gtk/Makefile.am                  |   9 --
 libgail-util/Makefile.am         |   8 +-
 win32/Makefile.msvcproj          |  30 +-----
 win32/vs10/Makefile.am           |  16 ---
 win32/vs10/gtk3-install.propsin  | 222 ---------------------------------------
 win32/vs9/Makefile.am            |  11 --
 win32/vs9/gtk3-install.vspropsin | 208 ------------------------------------
 10 files changed, 4 insertions(+), 524 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 860973b73e..c9a731b693 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -459,13 +459,6 @@ MSVCPROJS = gdk-3
 
 gdk_3_FILES = $(gdk_c_sources)
 gdk_3_EXCLUDES = dummy
-gdk_3_HEADERS_DIR = $(gdkincludedir)
-
-gdk_3_HEADERS_INST = \
-       $(gdkinclude_HEADERS)           \
-       $(deprecatedinclude_HEADERS)
-
-gdk_3_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/win32/Makefile.msvcproj
 
@@ -510,7 +503,6 @@ endif
 
 dist-hook: \
        $(top_builddir)/win32/vs9/gdk-3.vcproj  \
-       $(top_builddir)/win32/vs9/gdk-3.headers \
        $(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 81725deabb..3b518700dc 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -72,11 +72,6 @@ MSVCPROJS = gdk3-broadway broadwayd
 
 gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES)
 gdk3_broadway_EXCLUDES = dummy
-gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
-
-gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
-
-gdk3_broadway_HEADERS_EXCLUDES = dummy
 
 broadwayd_FILES = $(broadwayd_SOURCES)
 broadwayd_EXCLUDES = dummy
@@ -85,7 +80,6 @@ include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
        $(top_builddir)/win32/vs9/gdk3-broadway.vcproj          \
-       $(top_builddir)/win32/vs9/broadwayd.vcproj              \
-       $(top_builddir)/win32/vs9/gdk3-broadway.headers
+       $(top_builddir)/win32/vs9/broadwayd.vcproj
 
 -include $(top_srcdir)/git.mk
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index a665a9cc02..586e8fddc0 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -47,16 +47,10 @@ MSVCPROJS = gdk3-win32
 
 gdk3_win32_FILES = $(libgdk_win32_la_SOURCES)
 gdk3_win32_EXCLUDES = dummy
-gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir)
-
-gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
-
-gdk3_win32_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/win32/vs9/gdk3-win32.vcproj     \
-       $(top_builddir)/win32/vs9/gdk3-win32.headers
+       $(top_builddir)/win32/vs9/gdk3-win32.vcproj
 
 -include $(top_srcdir)/git.mk
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c7c7caabd2..81d6ed2736 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -526,14 +526,6 @@ gtk_3_FILES = \
        $(gtk_use_win32_c_sources)
 
 gtk_3_EXCLUDES = dummy
-gtk_3_HEADERS_DIR = $(gtkincludedir)
-
-gtk_3_HEADERS_INST = \
-       $(filter-out gtkversion.h, $(gtkinclude_HEADERS))       \
-       $(a11y_h_sources)       \
-       $(gtk_deprecated_h_sources)
-
-gtk_3_HEADERS_EXCLUDES = gtktypebuiltins.h
 
 include $(top_srcdir)/win32/Makefile.msvcproj
 
@@ -590,7 +582,6 @@ endif
 
 dist-hook: \
        $(top_builddir)/win32/vs9/gtk-3.vcproj  \
-       $(top_builddir)/win32/vs9/gtk-3.headers \
        $(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 # Install a RC file for the default GTK+ theme, and key themes
diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index aa2f93adcb..0b389ad8b8 100644
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -82,16 +82,10 @@ MSVCPROJS = gailutil-3
 gailutil_3_FILES = $(libgailutil_3_la_SOURCES)
 
 gailutil_3_EXCLUDES = dummy
-gailutil_3_HEADERS_DIR = $(libgailutilincludedir)
-
-gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS)
-
-gailutil_3_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/win32/vs9/gailutil-3.vcproj     \
-       $(top_builddir)/win32/vs9/gailutil-3.headers
+       $(top_builddir)/win32/vs9/gailutil-3.vcproj
 
 -include $(top_srcdir)/git.mk
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
index cd7e469fb1..c341313aee 100644
--- a/win32/Makefile.msvcproj
+++ b/win32/Makefile.msvcproj
@@ -17,13 +17,9 @@
 #   MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
 #   YourProject_FILES = $(libyourlib_1_0_SOURCES)
 #   YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random 
unsed value if none
-#   YourProject_HEADERS_DIR = $(libyourlibincludedir)
-#   YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
-#   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', 
wildcards allowed; use random unsed value if none>
 #
 #   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in 
the process)
-#      $(top_builddir)/win32/vs9/YourProject.vcproj    \
-#      $(top_builddir)/win32/vs9/YourProject.headers
+#      $(top_builddir)/win32/vs9/YourProject.vcproj
 
 
 # Private functions
@@ -40,13 +36,6 @@ _proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
 _proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst 
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
 _proj_filters=$($(_proj_name)_EXCLUDES)
 
-_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
-_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst 
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
-_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
-
-_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
-_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
-
 #
 # Creates Visual Studio 2008/2010 projects from items passed in from autotools files
 # $(1) - Base Name of the MSVC project files (outputs)
@@ -95,23 +84,6 @@ $(top_builddir)/win32/vs9/$(1).vcproj: Makefile
        $(RM) $(1).vs10.sourcefiles
        $(RM) $(1).vs10.sourcefiles.filters
 
-$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
-
-$(top_builddir)/win32/vs9/$(1).headers: Makefile
-       -$(RM) $(top_builddir)/win32/vs9/$(1).headers
-       -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
-
-       for F in $(_proj_headers); do \
-               case $$$$F in \
-               $(_proj_headers_excludes)) \
-                       ;; \
-               *.h|*.hpp|*.hh|*.hxx) \
-                       echo 'copy ..\..'$(_proj_subdir)$$$$F' 
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/$(1).headers && \
-                       echo 'copy ..\..'$(_proj_subdir)$$$$F' 
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
-                       ;; \
-               esac;   \
-       done
-
 endef
 
 $(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index 30df5f1d74..f12a18434f 100644
--- a/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -21,13 +21,6 @@ GENERATED_ITEMS = \
        gailutil-3.vcxproj.filters              \
        gtk3-version-paths.props
 
-MSVC10_HEADERS_LISTS = \
-       gdk3-win32.vs10.headers         \
-       gdk3-broadway.vs10.headers      \
-       gdk-3.vs10.headers              \
-       gtk-3.vs10.headers              \
-       gailutil-3.vs10.headers
-
 EXTRA_DIST += \
        README.txt                              \
        gtk+.sln                                \
@@ -69,13 +62,4 @@ EXTRA_DIST += \
 DISTCLEANFILES = \
        $(GENERATED_ITEMS)
 
-gtk3-install.props: $(top_srcdir)/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
-       -$(RM) $(top_builddir)/win32/vs11/gtk3-install.props
-       -$(RM) $(top_builddir)/win32/vs12/gtk3-install.props
-       -$(RM) $(top_builddir)/win32/vs14/gtk3-install.props
-       -$(RM) $(top_builddir)/win32/vs15/gtk3-install.props
-       -$(RM) $(top_builddir)/win32/vs16/gtk3-install.props
-       $(CPP) -P - <$(top_srcdir)/win32/vs10/gtk3-install.propsin >$@
-       rm $(MSVC10_HEADERS_LISTS)
-
 -include $(top_srcdir)/git.mk
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
index 4b6120ae37..f19e52c9f2 100644
--- a/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -1,12 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-MSVC_HEADERS_LISTS =   \
-       gdk3-win32.headers      \
-       gdk3-broadway.headers   \
-       gdk-3.headers           \
-       gtk-3.headers           \
-       gailutil-3.headers
-
 GENERATED_ITEMS = \
        gdk3-win32.vcproj               \
        gdk3-broadway.vcproj            \
@@ -44,10 +37,6 @@ EXTRA_DIST += \
        gtk3-version-paths.vsprops.in   \
        $(GENERATED_ITEMS)
 
-gtk3-install.vsprops: $(top_srcdir)/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS)
-       $(CPP) -P - <$(top_srcdir)/win32/vs9/gtk3-install.vspropsin >$@
-       rm $(MSVC_HEADERS_LISTS)
-
 DISTCLEANFILES = $(GENERATED_ITEMS)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]